[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/qtscript.cpp CONFLICT (content): Merge conflict in src/qtscript.cpp Automatic merge failed; fix conflicts and then commit the result. -- Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
CONFLICT (modify/delete): data/mp/stats/research/multiplayer/prresearch.txt deleted in HEAD and modified in bugfixes. Version bugfixes of data/mp/stats/research/multiplayer/prresearch.txt left in tree. Automatic merge failed; fix conflicts and then commit the result. -- Shape the Mobile Experience: Free Subscription Software experts and developers: Be at the forefront of tech innovation. Intel(R) Software Adrenaline delivers strategic insight and game-changing conversations that shape the rapidly evolving mobile landscape. Sign up now. http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
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 Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/scriptfuncs.cpp CONFLICT (content): Merge conflict in src/scriptfuncs.cpp Auto-merging src/multistat.cpp Auto-merging src/multiplay.cpp Auto-merging src/multiint.cpp Auto-merging src/hci.cpp Auto-merging src/data.cpp Auto-merging lib/netplay/netplay.cpp Auto-merging lib/ivis_opengl/bitimage.cpp Auto-merging data/mp/addon.lev Automatic merge failed; fix conflicts and then commit the result. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/research.cpp Auto-merging src/multiint.cpp Auto-merging src/loop.cpp Auto-merging src/keyedit.cpp Auto-merging src/intdisplay.cpp CONFLICT (content): Merge conflict in src/intdisplay.cpp Auto-merging src/hci.h Auto-merging src/hci.cpp CONFLICT (content): Merge conflict in src/hci.cpp Auto-merging src/frontend.cpp Auto-merging src/display.cpp Auto-merging src/challenge.cpp Auto-merging lib/widget/widgint.h Auto-merging lib/widget/widget.h Auto-merging lib/widget/widget.cpp CONFLICT (content): Merge conflict in lib/widget/widget.cpp Auto-merging lib/widget/widgbase.h CONFLICT (content): Merge conflict in lib/widget/widgbase.h Auto-merging lib/widget/slider.h CONFLICT (content): Merge conflict in lib/widget/slider.h Auto-merging lib/widget/slider.cpp CONFLICT (content): Merge conflict in lib/widget/slider.cpp Auto-merging lib/widget/label.h Auto-merging lib/widget/label.cpp CONFLICT (content): Merge conflict in lib/widget/label.cpp Auto-merging lib/widget/form.h CONFLICT (content): Merge conflict in lib/widget/form.h Auto-merging lib/widget/form.cpp CONFLICT (content): Merge conflict in lib/widget/form.cpp Auto-merging lib/widget/editbox.h Auto-merging lib/widget/editbox.cpp CONFLICT (content): Merge conflict in lib/widget/editbox.cpp Auto-merging lib/widget/button.h CONFLICT (content): Merge conflict in lib/widget/button.h Auto-merging lib/widget/button.cpp CONFLICT (content): Merge conflict in lib/widget/button.cpp Auto-merging lib/widget/bar.h Auto-merging lib/widget/bar.cpp CONFLICT (content): Merge conflict in lib/widget/bar.cpp Auto-merging configure.ac Automatic merge failed; fix conflicts and then commit the result. -- Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/research.cpp Auto-merging src/intdisplay.cpp CONFLICT (content): Merge conflict in src/intdisplay.cpp Auto-merging src/hci.h Auto-merging src/hci.cpp CONFLICT (content): Merge conflict in src/hci.cpp Auto-merging configure.ac Automatic merge failed; fix conflicts and then commit the result. -- Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/wrappers.cpp Auto-merging src/power.cpp Auto-merging src/multiint.cpp CONFLICT (content): Merge conflict in src/multiint.cpp Auto-merging src/loop.cpp Auto-merging src/Makefile.am Auto-merging macosx/Warzone.xcodeproj/project.pbxproj Auto-merging configure.ac Automatic merge failed; fix conflicts and then commit the result. -- Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122412 ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/template.cpp Auto-merging src/structure.cpp CONFLICT (content): Merge conflict in src/structure.cpp 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
[Warzone2100-project] Automerging bugfixes to master failed!
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 Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
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 Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
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. -- The Windows 8 Center - In partnership with Sourceforge Your idea - your app - 30 days. Get started! http://windows8center.sourceforge.net/ what-html-developers-need-to-know-about-coding-windows-8-metro-style-apps/ ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
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
[Warzone2100-project] Automerging bugfixes to master failed!
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
[Warzone2100-project] Automerging bugfixes to master failed!
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
[Warzone2100-project] Automerging bugfixes to master failed!
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. -- Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
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. -- Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
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/display3d.cpp Automatic merge failed; fix conflicts and then commit the result. -- Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
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/structure.h Auto-merging src/structure.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/droid.h Auto-merging src/droid.cpp Auto-merging src/display3d.cpp Auto-merging src/ai.cpp Auto-merging src/action.cpp CONFLICT (content): Merge conflict in src/action.cpp Automatic merge failed; fix conflicts and then commit the result. -- Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/structure.h Auto-merging src/structure.cpp Auto-merging src/droid.h Auto-merging src/droid.cpp Auto-merging src/ai.cpp Auto-merging src/action.cpp CONFLICT (content): Merge conflict in src/action.cpp Automatic merge failed; fix conflicts and then commit the result. -- Got visibility? Most devs has no idea what their production app looks like. Find out how fast your code is with AppDynamics Lite. http://ad.doubleclick.net/clk;262219671;13503038;y? http://info.appdynamics.com/FreeJavaPerformanceDownload.html ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/structure.h Auto-merging src/structure.cpp Auto-merging src/droid.h Auto-merging src/droid.cpp Auto-merging src/ai.cpp Auto-merging src/action.cpp CONFLICT (content): Merge conflict in src/action.cpp Automatic merge failed; fix conflicts and then commit the result. -- Got visibility? Most devs has no idea what their production app looks like. Find out how fast your code is with AppDynamics Lite. http://ad.doubleclick.net/clk;262219671;13503038;y? http://info.appdynamics.com/FreeJavaPerformanceDownload.html ___ Warzone2100-project mailing list Warzone2100-project@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-project
[Warzone2100-project] Automerging bugfixes to master failed!
Auto-merging src/action.cpp CONFLICT (content): Merge conflict in src/action.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
[Warzone2100-project] Automerging bugfixes to master failed!
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
