| commit | e75d9b90131c534b284953ade9dc5d8ff1ebe79a | |
| author | Kővágó Zoltán <DirtY.iCE.hu@gmail.com> | |
| Wed, 25 Jun 2008 21:11:50 +0000 (25 23:11 +0200) | ||
| committer | Kővágó Zoltán <DirtY.iCE.hu@gmail.com> | |
| Wed, 25 Jun 2008 21:11:50 +0000 (25 23:11 +0200) | ||
| tree | 6557b42ec72683a539e44a3d55b22e21849a6e17 | treesnapshot (tar.gz zip) |
| parent | 1b117988f618a445e48481a0b5182882936dce56 | commitdiff |
| parent | 9f3c28baac87c5cf7ad48da4d6f88ffb9c2e17fe | commitdiff |
Merge branch 'master' into object_priority_queue_aka_z_mapping_surfaces
Conflicts:
src/physfs/physfs.cpp
src/wscript
Merged by hand. Also edited src/video/loader.hpp to point to the new header.
Conflicts:
src/physfs/physfs.cpp
src/wscript
Merged by hand. Also edited src/video/loader.hpp to point to the new header.
| src/font/renderer.cpp | diff1 | diff2 | blobhistory |
| src/font/sdl_ttf_font.cpp | diff1 | diff2 | blobhistory |
| src/video/loader.hpp | diff1 | blobhistory | |
| src/wscript | diff1 | diff2 | blobhistory |