Richard Alam 8ba1e6484a Merge branch 'master' into ref-bbb-web-2 ... Conflicts: bbb-video/.gitignore bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java bigbluebutton-web/grails-app/conf/bigbluebutton.properties bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java		2011-06-16 14:49:57 -04:00
..
src/main	- add timestamp on filename so it will be unique	2011-06-13 16:57:37 -04:00
.classpath	- upgrade to Red5 0.9	2010-02-19 18:03:31 +00:00
.gitignore	Merge branch 'master' into ref-bbb-web-2	2011-06-16 14:49:57 -04:00
.project	initial import	2009-07-14 19:55:12 +00:00
build.gradle	- change build using gradle	2011-06-13 12:25:18 -04:00
vm-build.sh	- change build using gradle	2011-06-13 12:25:18 -04:00