Commit Graph

36 Commits

Author SHA1 Message Date
Sergey Solovyev
379f27db78 Merge branch 'master' into dev
Conflicts:
	android-app-core/res/values-de/text_vars.xml
	android-app-core/res/values-es/text_about.xml
	android-app-core/res/values-es/text_functions.xml
	android-app-core/res/values-es/text_operators.xml
	android-app-core/res/values-es/text_strings.xml
	android-app-core/res/values-es/text_vars.xml
	android-app-core/res/values-it/text_about.xml
	android-app-core/res/values-it/text_functions.xml
	android-app-core/res/values-it/text_operators.xml
	android-app-core/res/values-it/text_strings.xml
	android-app-core/res/values-it/text_vars.xml
	android-app-core/res/values-pl/text_about.xml
	android-app-core/res/values-pl/text_operators.xml
	android-app-core/res/values-pl/text_preferences.xml
	android-app-core/res/values-pl/text_strings.xml
	android-app-core/res/values-pl/text_vars.xml
	android-app-core/res/values-ru/text_about.xml
	android-app-core/res/values-uk/text_about.xml
	android-app-core/res/values-uk/text_functions.xml
	android-app-core/res/values-uk/text_operators.xml
	android-app-core/res/values-uk/text_preferences.xml
	android-app-core/res/values-uk/text_strings.xml
	android-app-core/res/values-uk/text_vars.xml
	android-app-core/res/values-zh-rtw/text_about.xml
	android-app-core/res/values-zh-rtw/text_functions.xml
	android-app-core/res/values-zh-rtw/text_operators.xml
	android-app-core/res/values-zh-rtw/text_preferences.xml
	android-app-core/res/values-zh-rtw/text_strings.xml
	android-app-core/res/values-zh-rtw/text_vars.xml
	android-app/project.properties
	pom.xml
2013-09-20 22:14:08 +04:00
Sergey Solovyev
21d326b563 deps version update 2013-09-20 21:26:09 +04:00
Sergey Solovyev
2bab557737 [maven-release-plugin] prepare for next development iteration 2013-07-22 15:04:30 +04:00
Sergey Solovyev
79afd35f6b [maven-release-plugin] prepare release release-2.0.0 2013-07-22 15:04:19 +04:00
Sergey Solovyev
d0de4f097c [maven-release-plugin] prepare for next development iteration 2013-07-18 18:28:13 +04:00
Sergey Solovyev
1e772f57ac [maven-release-plugin] prepare release release-1.6.3-b 2013-07-18 18:28:05 +04:00
Sergey Solovyev
f611f55190 [maven-release-plugin] prepare for next development iteration 2013-07-02 00:06:44 +04:00
Sergey Solovyev
95973053d2 [maven-release-plugin] prepare release release-1.6.3-a 2013-07-02 00:06:35 +04:00
Solovyev_S
1caf9413c0 tests fixed 2013-07-01 16:19:06 +04:00
Sergey Solovyev
99e7471ebd copyright + code reformat 2013-06-26 12:22:26 +04:00
Sergey Solovyev
072ee452ad tests 2013-06-18 14:39:20 +04:00
Sergey Solovyev
4840b6e25b wizard added 2013-06-18 00:44:44 +04:00
Sergey Solovyev
4658f42a8a fixes + @NotNull -> @Nonnull 2013-06-15 23:10:48 +04:00
Sergey Solovyev
e57ce8cf2c code reformat 2013-06-15 00:31:52 +04:00
Sergey Solovyev
a00a2ac684 deps versions update 2013-06-12 23:08:44 +04:00
Sergey Solovyev
cafa6b01ed [maven-release-plugin] prepare for next development iteration 2013-01-21 01:36:59 +04:00
Sergey Solovyev
7685ca3e33 [maven-release-plugin] prepare release release-1.6.2 2013-01-21 01:36:49 +04:00
Sergey Solovyev
a8f30a6d47 [maven-release-plugin] prepare for next development iteration 2013-01-20 18:26:48 +04:00
Sergey Solovyev
6e82c612a3 [maven-release-plugin] prepare release release-1.6.1 2013-01-20 18:26:40 +04:00
Sergey Solovyev
7d13bb6098 [maven-release-plugin] prepare for next development iteration 2013-01-20 17:19:33 +04:00
Sergey Solovyev
2844f3f47f [maven-release-plugin] prepare release release-1.6.0 2013-01-20 17:19:24 +04:00
Sergey Solovyev
47b7b291f3 new version 2013-01-20 17:12:30 +04:00
Sergey Solovyev
b60b576433 new plotter 2013-01-18 20:56:58 +04:00
Sergey Solovyev
5f7ee1e64e new plotter 2012-12-31 00:37:14 +04:00
Sergey Solovyev
d5706455e3 [maven-release-plugin] prepare for next development iteration 2012-12-07 21:55:18 +04:00
Sergey Solovyev
4c35cbe52f [maven-release-plugin] prepare release release-1.5.3 2012-12-07 21:54:50 +04:00
Sergey Solovyev
1645849a57 revert 2012-12-07 21:47:20 +04:00
Sergey Solovyev
92be672ddc [maven-release-plugin] prepare for next development iteration 2012-12-07 21:43:13 +04:00
Sergey Solovyev
8913fc7476 Version change 2012-12-07 21:09:50 +04:00
Sergey Solovyev
0e412efad9 Version change 2012-12-07 21:01:00 +04:00
Sergey Solovyev
457e1606ba [maven-release-plugin] prepare for next development iteration 2012-12-06 00:06:40 +04:00
Sergey Solovyev
92813aa1f0 [maven-release-plugin] prepare release release-1.5.3-b 2012-12-06 00:06:29 +04:00
Sergey Solovyev
8272409cb7 Version change 2012-12-05 23:14:56 +04:00
Sergey Solovyev
2747b26506 changes 2012-12-01 18:46:36 +04:00
Sergey Solovyev
53a2b84f51 changes 2012-11-30 18:07:20 +04:00
Sergey Solovyev
324bbda552 changes 2012-11-30 16:16:23 +04:00