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.
------------------------------------------------------------------------------ LogMeIn Central: Instant, anywhere, Remote PC access and management. Stay in control, update software, and manage PCs from one command center Diagnose problems and improve visibility into emerging IT issues Automate, monitor and manage. Do more in less time with Central http://p.sf.net/sfu/logmein12331_d2d _______________________________________________ Warzone2100-project mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/warzone2100-project
