Auto-merging src/wrappers.cpp Auto-merging src/power.cpp Auto-merging src/multiint.cpp CONFLICT (content): Merge conflict in src/multiint.cpp Auto-merging src/loop.cpp Auto-merging src/Makefile.am Auto-merging macosx/Warzone.xcodeproj/project.pbxproj Auto-merging configure.ac Automatic merge failed; fix conflicts and then commit the result.
------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122412 _______________________________________________ Warzone2100-project mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/warzone2100-project
