Merge in default

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2012-10-14 17:23:35 +02:00
49 changed files with 773 additions and 236 deletions
+1 -1
View File
@@ -267,7 +267,7 @@ public:
ParticleSystem *newParticleSystem(Image *image, int size);
Canvas *newCanvas(int width, int height);
Canvas *newCanvas(int width, int height, Canvas::TextureType texture_type = Canvas::TYPE_NORMAL);
PixelEffect *newPixelEffect(const std::string &code);