![]() Conflicts: code/PtiClic/AndroidManifest.xml code/PtiClic/res/layout/main.xml code/PtiClic/src/org/pticlic/Main.java |
||
---|---|---|
.. | ||
PtiClic | ||
serveur | ||
.gitignore |
![]() Conflicts: code/PtiClic/AndroidManifest.xml code/PtiClic/res/layout/main.xml code/PtiClic/src/org/pticlic/Main.java |
||
---|---|---|
.. | ||
PtiClic | ||
serveur | ||
.gitignore |