12 lines
157 B
Markdown
12 lines
157 B
Markdown
<<<<<<< HEAD
|
|
# Tetris
|
|
Basic tetris write in C++ and SDL
|
|
|
|
## Changelog
|
|
* 4/6/2015
|
|
* Replaced SDL with SDL2
|
|
=======
|
|
# Tetris
|
|
My tetris game
|
|
>>>>>>> master
|