Merge pull request #88 from raysan5/develop

Develop branch integration
raysan5 · Feb 21, 2016 · 75a73d9 · 75a73d9
2 parents 26252c4 + d042ed5
commit 75a73d9
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 114 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ pure spartan-programmers way. Are you ready to learn? Jump to [code examples!](h
 history
 -------
 
-I've developed videogames for some years and 4 year ago I started teaching videogames development 
+I've developed videogames for some years and 4 years ago I started teaching videogames development 
 to young people with artistic profile, most of them had never written a single line of code.
 
 I started with C language basis and, after searching for the most simple and easy-to-use library to teach 

diff --git a/examples/core_3d_picking.png b/examples/core_3d_picking.png
diff --git a/src/raylib.h b/src/raylib.h
@@ -697,7 +697,7 @@ void ImageFlipVertical(Image *image);
 void ImageFlipHorizontal(Image *image);                                                            // Flip image horizontally
 void ImageColorTint(Image *image, Color color);                                                    // Modify image color: tint
 void ImageColorInvert(Image *image);                                                               // Modify image color: invert
-void ImageColorGrayscale(Image *image);                                                            // Modify bimage color: grayscale
+void ImageColorGrayscale(Image *image);                                                            // Modify image color: grayscale
 void ImageColorContrast(Image *image, float contrast);                                             // Modify image color: contrast (-100 to 100)
 void ImageColorBrightness(Image *image, int brightness);                                           // Modify image color: brightness (-255 to 255)
 void GenTextureMipmaps(Texture2D texture);                                                         // Generate GPU mipmaps for a texture

diff --git a/src/resources b/src/resources