Labels Milestones

New Pull Request

création des activity menu, game et des layouts #1

Closed

enzo.jolys wants to merge 4 commits from Enzo into master

pull from: Enzo

merge into: enzo.jolys:master

enzo.jolys:master

enzo.jolys:Alexis

Conversation 0 Commits 4 Files Changed 8

4 Commits (master)

Author	SHA1	Message	Date
Jolys Enzo	8f9654fcc2	Merge remote-tracking branch 'origin/Enzo' into Enzo ... # 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	2 years ago
Jolys Enzo	cbbd4094d8	Ajout d'un canva avec un paint ( faut ajouter de bitmap pour crée les pieces	2 years ago
Jolys Enzo	c9919afa5c	création des activity menu, game et des layouts	2 years ago
Jolys Enzo	6b16e19a71	création des activity menu, game et des layouts	2 years ago