← Back to branch summary

~armagetronad-dev/armagetronad/0.2.8-armagetronad-sty

~armagetronad-dev/armagetronad/0.2.8-armagetronad-sty

Viewing all changes in revision 905.

Committer: Daniel Lee Harple
Date: 2011-05-14 16:11:48 UTC
mfrom: (873.12.137 armagetronad)
Revision ID: leeharple@gmail.com-20110514161148-4tcg24e366j6xvq9

Merge with 0.2.8-armagetronad-work

files modified:
config/settings.cfg

language/english_base.txt

language/english_base_notranslate.txt

src/network/nConfig.cpp

src/network/nNetwork.cpp

src/network/nServerInfo.cpp

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/ui/uInput.cpp

Show diffs side-by-side

added added

removed removed

config/settings.cfg

language/english_base.txt

language/english_base_notranslate.txt

src/network/nConfig.cpp

src/network/nNetwork.cpp

src/network/nServerInfo.cpp

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/ui/uInput.cpp

Older »