aafc420d53
Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.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