Gongxter e8428751f1 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java # app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuCellView.java		2015-11-13 14:43:04 +01:00
..
src	Merge remote-tracking branch 'origin/master'	2015-11-13 14:43:04 +01:00
.gitignore	First Commit. Adding some Source code.	2015-11-09 12:41:46 +01:00
app.iml	Redesigned a bit of the model.	2015-11-10 03:21:02 +01:00
build.gradle	Multilanguage for german English	2015-11-11 14:28:24 +01:00
proguard-rules.pro	First Commit. Adding some Source code.	2015-11-09 12:41:46 +01:00