bigbluebutton-Github/bigbluebutton-apps
Anton Georgiev 4172537f24 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
2014-11-28 20:33:11 +00:00
..
src Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 2014-11-28 20:33:11 +00:00
.classpath.old
.gitignore
build.gradle - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
gradle.properties - add gradle properties file to externalize version numbers 2013-09-30 18:09:21 +00:00
README
vm-build-debug.sh
vm-build.sh

 - see http://code.google.com/p/bigbluebutton/wiki/DevelopingBBB