Viewing all changes in revision 701.
- Committer: Luke Dashjr
- Date: 2010-04-20 23:21:40 UTC
- mfrom: (690.1.1 tr2noriginsbzr)
- Revision ID: luke+bzr@dashjr.org-20100420232140-3vd91ux0vl3i7ctc
MERGE: combine minor changes in manta's initial bazaar import (mostly whitespace)
- files removed:
- .BAHFyWKP
- .BAHFyWKP/MacOS
- .BAHFyWKP/MacOS/TR2N Origins.app
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL.framework
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL.framework/Versions
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL.framework/Versions/A
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL.framework/Versions/A/Headers
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL.framework/Versions/A/Resources
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/SDLMain.nib
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_image.framework
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_image.framework/Versions
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_image.framework/Versions/A
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_image.framework/Versions/A/Headers
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_image.framework/Versions/A/Resources
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_mixer.framework
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_mixer.framework/Versions
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_mixer.framework/Versions/A
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_mixer.framework/Versions/A/Headers
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/SDL_mixer.framework/Versions/A/Resources
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/libpng.framework
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/libpng.framework/Versions
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/libpng.framework/Versions/A
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/libpng.framework/Versions/A/Headers
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/libpng.framework/Versions/A/Resources
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Frameworks/libpng.framework/Versions/A/Resources/English.lproj
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/MacOS
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/English.lproj
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/SDLMain.nib
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/config
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/config/examples
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/config/examples/cvs_test
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/language
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/models
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/resource
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/sound
- .BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures
- .BAHFyWKP/MacOS/TR2N Origins.xcodeproj
- .BAHFyWKP/MacOS/build
- .BAHFyWKP/MacOS/build_tools
- files modified:
- AUTHORS
- sound/cyclrun.wav *
- sound/expl.wav *
- textures/shadow.png *
expand all
collapse all
added
removed
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/bike.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/dir_wall.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/floor.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/floor_a.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/floor_b.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/rim_wall_a.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/rim_wall_b.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/rim_wall_c.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/rim_wall_d.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/moviepack/title.jpg
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/KGN_logo.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/bike.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/cycle_body.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/cycle_wheel.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/dir_wall.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/floor.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/floor_a.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/floor_b.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/font.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/font_extra.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/font_s.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/rim_wall.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/shadow.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/sky.png
.BAHFyWKP/MacOS/TR2N Origins.app/Contents/Resources/textures/title.jpg
