← Back to branch summary

~armagetronad-dev/armagetronad/armagetronad-old-glancing

~armagetronad-dev/armagetronad/armagetronad-old-glancing

Viewing all changes in revision 786.

Committer: Daniel Lee Harple
Date: 2013-03-30 15:42:33 UTC
mfrom: (741.24.508 0.4-armagetronad-work)
Revision ID: leeharple@gmail.com-20130330154233-ysuloqx071s4mckc

Merge from 0.4

files modified:
src/Makefile.am

src/engine/eTeam.cpp

src/network/nSocket.cpp

src/thirdparty/Makefile.am

src/tools/tDirectories.cpp

src/tron/gOSXSDLMain.mm

Show diffs side-by-side

added added

removed removed

src/Makefile.am

src/engine/eTeam.cpp

src/network/nSocket.cpp

src/thirdparty/Makefile.am

src/tools/tDirectories.cpp

src/tron/gOSXSDLMain.mm

Older »