Merge branch 'master' into SDL2

Signed-off-by: SGOrava <sgd.orava@gmail.com>
2015-04-06 21:46:33 +02:00 · 2015-04-06 21:46:33 +02:00 · 6d50cbaa99
commit 6d50cbaa99
parent d07ecdc228 a8b5424b4a
1 changed files with 6 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -1,6 +1,11 @@
+<<<<<<< HEAD
 # Tetris
 Basic tetris write in C++ and SDL

 ## Changelog
 * 4/6/2015
  * Replaced SDL with SDL2
+=======
+# Tetris
+My tetris game
+>>>>>>> master