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 - make it compile 2012-07-16 19:03:12 +00:00
.gitignore - cleanup and adding bin to gitignore 2010-09-25 11:17:24 -04:00
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 - add README 2010-06-30 11:59:58 -04:00
vm-build-debug.sh enhance vm-build-debug.sh to exit when there is a build failure 2011-03-01 14:49:30 -06:00
vm-build.sh - modify to use resolveDeps 2010-07-21 13:11:20 -04:00

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