3070127a8e
Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as |
||
---|---|---|
.. | ||
src | ||
.classpath.old | ||
.gitignore | ||
build.gradle | ||
README | ||
vm-build-debug.sh | ||
vm-build.sh |
- see http://code.google.com/p/bigbluebutton/wiki/DevelopingBBB