serso
							
						 
					 | 
					
						
						
							
						
						8d0c631bfc
					 | 
					
						
						
							
							wizard moved to ACL
						
						
						
						
						
						
					 | 
					
						2013-12-13 23:09:54 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						3c0483fc01
					 | 
					
						
						
							
							translations
						
						
						
						
						
						
					 | 
					
						2013-10-10 22:03:06 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						b583d823c5
					 | 
					
						
						
							
							translations
						
						
						
						
						
						
					 | 
					
						2013-09-20 22:16:01 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						9c31ecb39d
					 | 
					
						
						
							
							translations
						
						
						
						
						
						
					 | 
					
						2013-09-20 22:01:40 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						c5464f4190
					 | 
					
						
						
							
							fix in translation
						
						
						
						
						
						
					 | 
					
						2013-07-18 11:58:59 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						73fee3cf56
					 | 
					
						
						
							
							translations added
						
						
						
						
						
						
					 | 
					
						2013-07-16 17:13:37 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						6ffef636e0
					 | 
					
						
						
							
							release notes moved to separate file
						
						
						
						
						
						
					 | 
					
						2013-06-26 21:29:53 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						6870232f26
					 | 
					
						
						
							
							help removed
						
						
						
						
						
						
					 | 
					
						2013-06-26 13:40:08 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						99e7471ebd
					 | 
					
						
						
							
							copyright + code reformat
						
						
						
						
						
						
					 | 
					
						2013-06-26 12:22:26 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						e57ce8cf2c
					 | 
					
						
						
							
							code reformat
						
						
						
						
						
						
					 | 
					
						2013-06-15 00:31:52 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Solovyev
							
						 
					 | 
					
						
						
							
						
						c2662e7537
					 | 
					
						
						
							
							changes
						
						
						
						
						
						
					 | 
					
						2012-12-01 17:46:16 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |