5f800daa25
Conflicts: calculatorpp/AndroidManifest.xml |
||
---|---|---|
.. | ||
misc | ||
res | ||
src | ||
AndroidManifest.xml | ||
pom.xml | ||
proguard.cfg | ||
project.properties |
5f800daa25
Conflicts: calculatorpp/AndroidManifest.xml |
||
---|---|---|
.. | ||
misc | ||
res | ||
src | ||
AndroidManifest.xml | ||
pom.xml | ||
proguard.cfg | ||
project.properties |