Dmitriy Simushev ae149896e7 Merge branch 'v1.6.x' into OSSG/master ... Conflicts: src/messenger/webim/install/dbperform.php src/messenger/webim/js/164/common.js src/messenger/webim/libs/common.php src/messenger/webim/locales/en/properties src/messenger/webim/locales/ru/properties src/messenger/webim/operator/canned.php src/messenger/webim/operator/operator.php src/messenger/webim/operator/operators.php src/messenger/webim/operator/performance.php src/messenger/webim/operator/settings.php src/messenger/webim/operator/translate.php src/messenger/webim/operator/update.php src/messenger/webim/operator/users.php src/messenger/webim/view/agents.php src/messenger/webim/view/performance.php		2013-03-11 11:01:35 +00:00
..
.idea	apache 2 license in php headers	2013-03-06 22:22:53 +01:00
tools	remove eclipse files; update version to 1.6.5; fix headers	2013-03-06 22:32:31 +01:00
webim	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
check_translation.pl	update utility scripts	2009-04-23 22:40:59 +00:00
compile_js	apply patch by Andrew Armstrong: available operators list (revised); remove odd eval code in common.js; fix obfuscation	2011-02-21 01:02:39 +01:00
compute_resources.pl	1.6.4 RC2	2011-03-05 00:17:04 +01:00
pack.pl	remove eclipse files; update version to 1.6.5; fix headers	2013-03-06 22:32:31 +01:00