Felipe Cecagno 12f7aacf4b Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 ... Conflicts: bigbluebutton-client/locale/fr_CA/bbbResources.properties bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml		2014-12-09 16:52:43 -02:00
..
bin	Merge branch 'bbb-conf-fix' of https://github.com/ffdixon/bigbluebutton into ffdixon-bbb-conf-fix	2014-11-27 14:47:43 -05:00
cron.daily	Updated the cron.daily job for bigbluebutton to delete .pfb and .afm files generated by ghostscript from the /tmp directory.	2014-11-27 14:23:18 -05:00
record	added chrome plugin patch for test recording	2010-11-19 05:04:16 +00:00
slides	moving these configuration files into git	2010-09-18 23:24:04 +00:00
web	Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1	2014-11-22 20:28:39 -02:00
bigbluebutton-release	Upping version from 0.9.0-dev to 0.9.0-beta	2014-09-01 17:05:33 -04:00
check-localization-keys.txt	remove and add strings for the localization file	2013-05-27 17:56:48 -05:00