Auto-merging src/power.cpp CONFLICT (content): Merge conflict in src/power.cpp Auto-merging src/multiint.cpp Auto-merging src/init.cpp CONFLICT (content): Merge conflict in src/init.cpp Auto-merging src/hci.cpp Auto-merging lib/netplay/netplay.cpp Automatic merge failed; fix conflicts and then commit the result.
------------------------------------------------------------------------------ DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk _______________________________________________ Warzone2100-project mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/warzone2100-project
