← Back to branch summary

~vitty/armagetronad/trunk-armagetronad-breakpad

~vitty/armagetronad/trunk-armagetronad-breakpad

Viewing all changes in revision 1037.

Committer: Vitty
Date: 2011-07-30 16:34:48 UTC
mfrom: (1021.1.22 carm)
Revision ID: vitty4@gmail.com-20110730163448-w42bn6nn8hz2x0yp

Merge trunk for osx and win fixes

files modified:
MacOS/shared.xcconfig

NEWS

batch/make/uninstall

batch/make/version

config/settings.cfg

config/settings_dedicated.cfg

configure.ac

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/polish.txt

language/spanish.txt

src/Makefile.am

src/engine/ePlayer.cpp

src/engine/eTimer.cpp

src/engine/eTimer.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nServerInfo.cpp

src/protobuf/eTimer.proto

src/tools/tColor.h

src/tools/tConsole.cpp

src/tools/tConsole.h

src/tools/tError.cpp

src/tools/tRecorder.cpp

src/tools/tRecorder.h

src/tools/tRecorderInternal.cpp

src/tools/tRecorderInternal.h

src/tools/tString.cpp

src/tools/tSysTime.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gMenus.cpp

src/win32/config_common.h

src/win32_ded/aa_config.h

win32/armagetronad.nsi

win32/armagetronad_dedicated.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/ArmagetronAd.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/code_blocks/ZThread.cbp

win32/protobuf.bat

win32/update_version.bat

Show diffs side-by-side

added added

removed removed

MacOS/shared.xcconfig

batch/make/uninstall

batch/make/version

config/settings.cfg

config/settings_dedicated.cfg

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/polish.txt

language/spanish.txt

src/Makefile.am

src/engine/ePlayer.cpp

src/engine/eTimer.cpp

src/engine/eTimer.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nServerInfo.cpp

src/protobuf/eTimer.proto

src/tools/tColor.h

src/tools/tConsole.cpp

src/tools/tConsole.h

src/tools/tError.cpp

src/tools/tRecorder.cpp

src/tools/tRecorder.h

src/tools/tRecorderInternal.cpp

src/tools/tRecorderInternal.h

src/tools/tString.cpp

src/tools/tSysTime.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gMenus.cpp

src/win32/config_common.h

src/win32_ded/aa_config.h

win32/armagetronad.nsi

win32/armagetronad_dedicated.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/ArmagetronAd.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/code_blocks/ZThread.cbp

win32/protobuf.bat

win32/update_version.bat

Older »