Merged in changes from main repository

This commit is contained in:
Alexander Szpakowski
2013-01-21 02:31:15 -04:00
13 changed files with 191 additions and 49 deletions
+2
View File
@@ -64,6 +64,8 @@ public:
love::image::ImageData *getImageData(love::image::Image *image);
void getPixel(unsigned char* pixel_rgba, int x, int y);
void setFilter(const Image::Filter &f);
Image::Filter getFilter() const;