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.
------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_sfd2d_oct _______________________________________________ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
