Sergey Solovyev 5f800daa25 Merge branch 'dev-widget' into release-1.4 ...

Conflicts:
	calculatorpp/AndroidManifest.xml

2012-10-20 16:27:08 +04:00

..

misc

Calculator++ widget

2012-10-20 16:22:25 +04:00

res

Calculator++ widget

2012-10-20 16:22:25 +04:00

src

Calculator++ widget

2012-10-20 16:22:25 +04:00

AndroidManifest.xml

Merge branch 'dev-widget' into release-1.4

2012-10-20 16:27:08 +04:00

pom.xml

Version changed

2012-10-20 16:26:34 +04:00

proguard.cfg

sherlock actionbar + proguard

2012-10-10 22:28:18 +04:00

project.properties

Widget implementation

2012-10-19 18:20:03 +04:00