6bab3adf61
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 |
||
---|---|---|
.. | ||
src | ||
.classpath.old | ||
.gitignore | ||
build.gradle | ||
gradle.properties | ||
README | ||
vm-build-debug.sh | ||
vm-build.sh |
- see http://code.google.com/p/bigbluebutton/wiki/DevelopingBBB