android-calculatorpp/calculatorpp
Sergey Solovyev 1a284cbf13 Merge remote-tracking branch 'origin/dev-widget' into dev-widget
Conflicts:
	calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
	calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
2012-10-26 21:37:48 +04:00
..
misc Calculator++ widget 2012-10-20 16:22:25 +04:00
res Widget fixes 2012-10-20 17:18:46 +04:00
src Merge remote-tracking branch 'origin/dev-widget' into dev-widget 2012-10-26 21:37:48 +04:00
AndroidManifest.xml Widget changes 2012-10-22 00:23:50 +04:00
pom.xml Pom changes 2012-10-22 00:03:40 +04:00
proguard.cfg sherlock actionbar + proguard 2012-10-10 22:28:18 +04:00
project.properties Merge remote-tracking branch 'origin/dev-widget' into dev-widget 2012-10-26 21:37:48 +04:00