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 [email protected] https://lists.sourceforge.net/lists/listinfo/warzone2100-project
