← Back to branch summary

~armagetronad-ct/armagetronad/0.2.8-armagetronad-sty

~armagetronad-ct/armagetronad/0.2.8-armagetronad-sty

Viewing all changes in revision 910.

Committer: Kyle
Date: 2012-11-13 18:10:30 UTC
mfrom: (873.12.274 0.2.8-armagetronad-work)
Revision ID: racingmasterweb@gmail.com-20121113181030-uqh88lsfzewds0dc

merging in mainline

files modified:
language/english_base.txt

src/engine/eTeam.cpp

src/engine/eTeam.h

src/render/rConsoleCout.cpp

src/tools/tLocale.cpp

src/tools/tLocale.h

src/tron/gArmagetron.cpp

Show diffs side-by-side

added added

removed removed

language/english_base.txt

src/engine/eTeam.cpp

src/engine/eTeam.h

src/render/rConsoleCout.cpp

src/tools/tLocale.cpp

src/tools/tLocale.h

src/tron/gArmagetron.cpp

Older »