]> git.nickg.me.uk Git - lander.git/commit
Merge branch 'master' of vds:/home/nick/git/lander into texture_cache
authorNick Gasson <nick@nickg.me.uk>
Wed, 3 Jun 2009 18:32:09 +0000 (19:32 +0100)
committerNick Gasson <nick@nickg.me.uk>
Wed, 3 Jun 2009 18:32:09 +0000 (19:32 +0100)
commit54404b57bd236b04d7914b84c9b42e3928b3b345
tree089cd2d8f33e6c095b7708f857cf3c588d911a54
parentabaa7af55c2efe9599f2d8968abcf41e927c1f2f
parentaaa00423ed4255c81d1e0a2ebf98696e3c48d64d
Merge branch 'master' of vds:/home/nick/git/lander into texture_cache

Conflicts:
src/Image.cpp
src/Image.hpp
src/Texture.cpp
config.h.in
src/Font.cpp
src/Texture.cpp
src/Texture.hpp