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.
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.
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.
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
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.
---
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.
---
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/struct
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/qtscr
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/qtscr
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/qtscr
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/qtscr
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/qtscr
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/qtscr
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/qtscr
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/qtscr
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/qtscr
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 c
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,
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
Auto-merging macosx/configs/mkdmgs.sh
CONFLICT (content): Merge conflict in macosx/configs/mkdmgs.sh
Auto-merging configure.ac
Automatic merge failed; fix conflicts and then commit the result.
--
Master Visual Studio, Shar
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 th
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.c
Auto-merging po/zh_TW.po
CONFLICT (content): Merge conflict in po/zh_TW.po
Auto-merging po/zh_CN.po
CONFLICT (content): Merge conflict in po/zh_CN.po
Auto-merging po/uk_UA.po
CONFLICT (content): Merge conflict in po/uk_UA.po
Auto-merging po/tr.po
CONFLICT (content): Merge conflict in po/tr.po
Auto-
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
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 comm
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.
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 Solu
27 matches
Mail list logo
