Merging update from trunk (rev. 29669)

svn-id: r29695
This commit is contained in:
Sean Murray
2007-12-02 10:16:19 +00:00
parent b7aab05061
commit 4206be178d
14 changed files with 175 additions and 222 deletions
-1
View File
@@ -25,7 +25,6 @@
#include "util.h"
#include <png.h>
#include <zlib.h>
const uint32 typeDEXA = 0x41584544;
const uint32 typeFRAM = 0x4d415246;