bigbluebutton-Github/bigbluebutton-apps
Felipe Cecagno 6bab3adf61 Merge branch 'meeting-created-params' into mconf-live0.6.2
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/Constants.java
2015-03-20 12:37:58 -03:00
..
src Merge branch 'meeting-created-params' into mconf-live0.6.2 2015-03-20 12:37:58 -03: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 - update to latest red5 with local connection ishared object fix 2015-01-13 18:08:03 +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