Archive/Tetris
1
Fork 0
Code Releases Activity

Merge branch 'master' into SDL2

Browse Source 
Signed-off-by: SGOrava <sgd.orava@gmail.com>
This commit is contained in:
SGOrava 2015-04-06 21:46:33 +02:00
commit 6d50cbaa99
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -1,6 +1,11 @@
<<<<<<< HEAD
# Tetris # Tetris
Basic tetris write in C++ and SDL Basic tetris write in C++ and SDL
## Changelog ## Changelog
* 4/6/2015 * 4/6/2015
* Replaced SDL with SDL2 * Replaced SDL with SDL2
=======
# Tetris
My tetris game
>>>>>>> master