zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/module-schema-tools into lp:zorba

To: mp+102001@xxxxxxxxxxxxxxxxxx
From: Chris Hillery <chillery+launchpad@xxxxxxxxx>
Date: Sat, 14 Apr 2012 07:12:16 -0000
In-reply-to: <20120414071012.27438.3869.launchpad@ackee.canonical.com>
Reply-to: mp+102001@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Approve

I merged from the trunk, but I wasn't totally sure that I did the right thing with stdafx.h. So I re-submitted the proposal so Matthias and Cezar could have a chance to re-review.

As far as I can tell, stdafx.h was never explicitly changed on the module-schema-tools branch; the only commits which affected it were merges from the trunk. So I don't know why there were merge conflicts now. But I just made it identical to the current trunk. If that's OK, then you two should go ahead and re-approve.
-- 
https://code.launchpad.net/~zorba-coders/zorba/module-schema-tools/+merge/102001
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/module-schema-tools into lp:zorba
From: Chris Hillery, 2012-04-14