Auto-merging src/template.cpp Auto-merging src/structure.cpp CONFLICT (content): Merge conflict in src/structure.cpp Auto-merging src/researchdef.h Auto-merging src/multiplay.cpp Auto-merging src/display.cpp Automatic merge failed; fix conflicts and then commit the result.
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
