Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style

to native for some files that were still missing this property. This is 
a feeble attempt to reduce the amount of conflicts for future merges.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 2d5cbe82..ad280eeb 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -159,7 +159,7 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
         GLenum error = glGetError();
         if (error)
         {
-            std::string errmsg = "Unkown error";
+            std::string errmsg = "Unknown error";
             switch (error)
             {
                 case GL_INVALID_ENUM:
@@ -343,5 +343,5 @@ SubImage::~SubImage()
 
 Image *SubImage::getSubImage(int x, int y, int w, int h)
 {
-    return NULL;
+    return mParent->getSubImage(mBounds.x + x, mBounds.y + y, w, h);
 }