Sergey Solovyev c772a4e429 Merge remote-tracking branch 'origin/master' ... Conflicts: android-app-core/res/values-ru/text_about.xml android-app-core/res/values-ru/text_wizard.xml android-app-core/res/values/text_about.xml android-app-core/res/values/text_wizard.xml pom.xml		2013-07-03 00:08:50 +04:00
..
assets	new plotter	2013-01-06 16:35:53 +04:00
misc	new plotter	2012-12-31 00:37:14 +04:00
res	translations	2013-07-02 16:43:48 +04:00
src	facebook button substituted with operators in the widget	2013-07-02 16:29:49 +04:00
AndroidManifest.xml	android manifest version udpate	2013-07-02 00:21:50 +04:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-07-02 00:06:44 +04:00
proguard.cfg	code reformat	2013-06-15 00:31:52 +04:00
project.properties	versions updated	2013-07-01 23:55:27 +04:00