Merge remote-tracking branch 'origin/Enzo' into Enzo

Browse Source

# Conflicts:
#	Tetris/app/build.gradle
#	Tetris/app/src/main/AndroidManifest.xml
#	Tetris/app/src/main/java/activity/Game.kt
#	Tetris/app/src/main/java/modele/Draw.kt
#	Tetris/app/src/main/res/layout/activity_game.xml
#	Tetris/build.gradle

pull/1/head

Jolys Enzo 2 years ago

parent cbbd4094d8 6b16e19a71

commit 8f9654fcc2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available