Nikolay Pultsin 1439cc16ee Merge branch 'master' into lr ... Conflicts: scripts/packageTool.sh		2015-01-16 15:32:04 +00:00
..
resources	interface language option	2013-03-09 04:26:21 +04:00
buildAll.sh	temporary branches	2015-01-02 18:01:49 +00:00
changeCopyright.pl	copyrights: 2012 => 2013	2013-01-03 04:41:27 +00:00
copyright	copyright notices have been changed	2011-01-02 14:15:35 +00:00
mergeAll.sh	updated merge process	2015-01-15 19:11:47 +00:00
packageTool.sh	Merge branch 'master' into lr	2015-01-16 15:32:04 +00:00
set_tags.sh	temporary branches	2015-01-02 18:01:49 +00:00