Auto-merging tools/map/mapload.cpp CONFLICT (content): Merge conflict in tools/map/mapload.cpp Auto-merging tests/qtscripttest.cpp Auto-merging tests/modeltest.c Auto-merging src/template.cpp CONFLICT (content): Merge conflict in src/template.cpp Auto-merging src/research.cpp Auto-merging src/qtscriptfuncs.cpp Auto-merging src/multiint.cpp CONFLICT (content): Merge conflict in src/multiint.cpp Auto-merging src/intdisplay.cpp CONFLICT (content): Merge conflict in src/intdisplay.cpp Auto-merging src/game.cpp Auto-merging src/display3d.cpp Automatic merge failed; fix conflicts and then commit the result.
------------------------------------------------------------------------------ The Windows 8 Center - In partnership with Sourceforge Your idea - your app - 30 days. Get started! http://windows8center.sourceforge.net/ what-html-developers-need-to-know-about-coding-windows-8-metro-style-apps/ _______________________________________________ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project