Tetris/README.md

<<<<<<< HEAD
# Tetris
Basic tetris write in C++ and SDL

## Changelog
* 4/6/2015
  * Replaced SDL with SDL2
=======
# Tetris
My tetris game
>>>>>>> master
Merge branch 'master' into SDL2 Signed-off-by: SGOrava <sgd.orava@gmail.com> 2015-04-06 21:46:33 +02:00			`<<<<<<< HEAD`
Replaced SDL 1.2 with SDL 2.0 2015-04-06 21:25:23 +02:00			`# Tetris`
			`Basic tetris write in C++ and SDL`

			`## Changelog`
			`* 4/6/2015`
Merge branch 'master' into SDL2 Signed-off-by: SGOrava <sgd.orava@gmail.com> 2015-04-06 21:46:33 +02:00			`* Replaced SDL with SDL2`
			`=======`
Update README.md 2015-02-14 18:38:14 +01:00			`# Tetris`
			`My tetris game`
Merge branch 'master' into SDL2 Signed-off-by: SGOrava <sgd.orava@gmail.com> 2015-04-06 21:46:33 +02:00			`>>>>>>> master`