← Back to branch summary

~armagetronad-ct/armagetronad/0.4-advrim

~armagetronad-ct/armagetronad/0.4-advrim

Viewing all changes in revision 1457.

Committer: Voodoo
Date: 2013-04-11 10:46:24 UTC
Revision ID: voodoo-20130411104624-zse1f33o7ten188z

merge -r 1454..1476 lp:armagetronad/0.4

files added:
batch/make/os-x-minimum-system-version

batch/make/symlink-relative

desktop/os-x

files removed:
MacOS

MacOS/Armagetron Advanced.xcodeproj

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/rakefile.rb

MacOS/rakelib

MacOS/rakelib/aabeta.rake

MacOS/rakelib/config.rb

MacOS/rakelib/release.rake

MacOS/rakelib/xcode.rake

MacOS/shared.xcconfig

src/macosx

src/macosx/AAGrowlBridge.h

src/macosx/AAGrowlBridge.mm

src/macosx/AAGrowlPlugin.h

src/macosx/AAGrowlPlugin.mm

src/macosx/AARuby.h

src/macosx/AARuby.mm

src/macosx/Armagetron Advanced_Prefix.pch

src/macosx/English.lproj

src/macosx/English.lproj/InfoPlist.strings.in

src/macosx/SDLMain.nib

src/macosx/SDLMain.nib/classes.nib

src/macosx/SDLMain.nib/info.nib

src/macosx/SDLMain.nib/objects.nib

src/macosx/client

src/macosx/client/aa_config.h

src/macosx/config_common.h

src/macosx/dedicated

src/macosx/dedicated/aa_config.h

src/macosx/version.h.in

files renamed:
src/macosx/Info.plist => desktop/os-x/Info.plist.in

MacOS/Armagetron Advanced.icns => desktop/os-x/armagetronad.icns

doc/ => documentation/

src/macosx/SDLMain.h => src/tron/gOSXSDLMain.h

src/macosx/SDLMain.mm => src/tron/gOSXSDLMain.mm

src/macosx/AAURLHandler.h => src/tron/gOSXURLHandler.h

src/macosx/AAURLHandler.mm => src/tron/gOSXURLHandler.mm

src/macosx/AAPaste.cpp => src/ui/uOSXPaste.cpp

src/macosx/AAPaste.h => src/ui/uOSXPaste.h

files modified:
.bzrignore

Makefile.am

Makefile.manual

NEWS

README-Subversion

batch/Makefile.am

configure.ac

desktop/Makefile.am

language/english_base.txt

resource/Makefile.am

src/Makefile.am

src/engine/eCamera.cpp

src/engine/eEventNotification.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/network/nNetwork.cpp

src/network/nSocket.cpp

src/render/rSysdep.cpp

src/thirdparty/Makefile.am

src/tools/tDirectories.cpp

src/tools/tMemManager.cpp

src/tools/tMemManager.h

src/tools/tVersion.cpp

src/tron/cockpit/cCockpit.cpp

src/tron/gArmagetron.cpp

src/tron/gMenus.cpp

src/tron/gServerBrowser.cpp

src/tron/gStuff.cpp

src/tron/zone/zFortress.cpp

src/tron/zone/zShape.cpp

src/ui/uInput.cpp

src/ui/uMenu.cpp

Show diffs side-by-side

added added

removed removed

MacOS/Armagetron Advanced.xcodeproj/

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/rakefile.rb

MacOS/rakelib/aabeta.rake

MacOS/rakelib/config.rb

MacOS/rakelib/release.rake

MacOS/rakelib/xcode.rake

MacOS/shared.xcconfig

Makefile.manual

README-Subversion

batch/Makefile.am

batch/make/os-x-minimum-system-version

batch/make/symlink-relative

desktop/Makefile.am

desktop/os-x/Info.plist.in

language/english_base.txt

resource/Makefile.am

src/Makefile.am

src/engine/eCamera.cpp

src/engine/eEventNotification.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/macosx/AAGrowlBridge.h

src/macosx/AAGrowlBridge.mm

src/macosx/AAGrowlPlugin.h

src/macosx/AAGrowlPlugin.mm

src/macosx/AARuby.h

src/macosx/AARuby.mm

src/macosx/Armagetron Advanced_Prefix.pch

src/macosx/English.lproj/

src/macosx/English.lproj/InfoPlist.strings.in

src/macosx/SDLMain.nib/

src/macosx/SDLMain.nib/classes.nib

src/macosx/SDLMain.nib/info.nib

src/macosx/SDLMain.nib/objects.nib

src/macosx/client/

src/macosx/client/aa_config.h

src/macosx/config_common.h

src/macosx/dedicated/

src/macosx/dedicated/aa_config.h

src/macosx/version.h.in

src/network/nNetwork.cpp

src/network/nSocket.cpp

src/render/rSysdep.cpp

src/thirdparty/Makefile.am

src/tools/tDirectories.cpp

src/tools/tMemManager.cpp

src/tools/tMemManager.h

src/tools/tVersion.cpp

src/tron/cockpit/cCockpit.cpp

src/tron/gArmagetron.cpp

src/tron/gMenus.cpp

src/tron/gOSXSDLMain.mm

src/tron/gOSXURLHandler.h

src/tron/gOSXURLHandler.mm

src/tron/gServerBrowser.cpp

src/tron/gStuff.cpp

src/tron/zone/zFortress.cpp

src/tron/zone/zShape.cpp

src/ui/uInput.cpp

src/ui/uMenu.cpp

src/ui/uOSXPaste.cpp

src/ui/uOSXPaste.h

Older »