SteveGilvarry a700cbffdb Merge remote-tracking branch 'upstream/master' into feature-plugins ... Conflicts: CMakeLists.txt configure.ac src/zm_monitor.cpp src/zm_monitor.h web/lang/big5_big5.php web/lang/cn_zh.php web/lang/cs_cz.php web/lang/de_de.php web/lang/dk_dk.php web/lang/en_gb.php web/lang/es_ar.php web/lang/es_es.php web/lang/et_ee.php web/lang/fr_fr.php web/lang/he_il.php web/lang/hu_hu.php web/lang/it_it.php web/lang/ja_jp.php web/lang/nl_nl.php web/lang/pl_pl.php web/lang/pt_br.php web/lang/ro_ro.php web/lang/ru_ru.php web/lang/se_se.php web/skins/classic/views/monitor.php		2015-11-08 21:06:21 +11:00
..
classic	Merge remote-tracking branch 'upstream/master' into feature-plugins	2015-11-08 21:06:21 +11:00
mobile	fix montage view issue in mobile skin	2015-06-26 08:47:20 -05:00
xml	add translate function	2015-05-10 08:10:30 -05:00
Makefile.am	remove the flat subdir	2014-12-01 15:55:22 -05:00