Anton Georgiev 8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 ... Conflicts: akka-bbb-apps/build.sbt akka-bbb-fsesl/build.sbt bbb-common-message/build.sbt bigbluebutton-apps/build.gradle		2015-10-22 20:46:30 +00:00
..
src/main	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1	2015-10-22 20:46:30 +00:00
.classpath	- update jar to latest red5	2015-08-10 21:32:00 +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	- update jar to latest red5	2015-08-10 21:32:00 +00:00
vm-build.sh	- change build using gradle	2011-06-13 12:25:18 -04:00