scrawl 062ff189a2 Merge branch 'master' into memory

2013-05-04 23:04:33 +02:00

..

oics

Fix warning issued by GCC 4.8 in oics/tinyxml.cpp

2013-05-04 07:53:03 +02:00

shiny

Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)

2013-05-03 13:55:57 +02:00