android-calculatorpp

Go to file

Sergey Solovyev b9dd6b0fef Merge branch 'dev-app-structure' into dev

Conflicts:
	android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
	android-app/AndroidManifest.xml
	android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java

2012-12-01 21:30:47 +04:00

android-app

Merge branch 'dev-app-structure' into dev

2012-12-01 21:30:47 +04:00

android-app-core

Merge branch 'dev-app-structure' into dev

2012-12-01 21:30:47 +04:00

android-app-onscreen

changes

2012-12-01 21:26:07 +04:00

android-app-test

changes

2012-11-30 16:16:23 +04:00

android-app-widget

changes

2012-12-01 20:15:24 +04:00

calculatorpp

Merge branch 'dev-app-structure' into dev

2012-12-01 21:30:47 +04:00

core

changes

2012-12-01 18:46:36 +04:00

pom.xml

changes

2012-12-01 18:46:36 +04:00