The tag, upstream/0_20110520.1+hge4354 has been created
at a32fee4f6170ac9a1aba7ce0a0106fd121ac2445 (commit)
- Shortlog ------------------------------------------------------------
commit a32fee4f6170ac9a1aba7ce0a0106fd121ac2445
Merge: ba0a3e9 9739a26
Author: Arand Nash <[email protected]>
Date: Tue May 24 21:54:34 2011 +0100
Merge branch 'clean_data' of ../lugaru into data
Conflicts:
.hgignore
CMakeLists.txt
Dependencies/libjpeg/jconfig.h
Source/Animation.cpp
Source/Frustum.cpp
Source/Game.h
Source/GameDraw.cpp
Source/GameInitDispose.cpp
Source/GameTick.cpp
Source/Globals.cpp
Source/Input.h
Source/Lights.h
Source/MacCompatibility.h
Source/Models.cpp
Source/Models.h
Source/Objects.cpp
Source/Objects.h
Source/OpenGL_Windows.cpp
Source/Person.cpp
Source/Person.h
Source/PhysicsMath.h
Source/Quaternions.h
Source/Random.h
Source/Settings.cpp
Source/Skeleton.cpp
Source/Skeleton.h
Source/Skybox.cpp
Source/Skybox.h
Source/TGALoader.cpp
Source/TGALoader.h
Source/Terrain.cpp
Source/Text.cpp
Source/Text.h
Source/Weapons.cpp
Source/Weapons.h
Source/WinDefs.cpp
Source/WinDefs.h
Source/gamegl.h
Source/glstubs.h
Source/openal_wrapper.cpp
Source/openal_wrapper.h
Source/pack.c
Source/unpack.c
Xcode/Lugaru.xcodeproj/project.pbxproj
-----------------------------------------------------------------------
--
Packaging for Lugaru HD
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
