Naomi 6bdc2caaec Merge branch 'CC-2301'		2013-05-03 16:15:39 -04:00
..
application	Merge branch 'CC-2301'	2013-05-03 16:15:39 -04:00
build	Merge branch 'master' into CC-2301	2013-05-01 11:04:14 -04:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	Updated translation files against current strings	2013-04-11 18:20:25 +01:00
public	CC-2301 : not allowing any sliding with only global crossfade durations.	2013-05-03 15:32:07 -04:00
tests	test commit	2012-10-29 19:19:48 -04:00