Auto-merging src/terrain.cpp Auto-merging macosx/configs/mkdmgs.sh CONFLICT (content): Merge conflict in macosx/configs/mkdmgs.sh Automatic merge failed; fix conflicts and then commit the result.
------------------------------------------------------------------------------ Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov _______________________________________________ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
