5559a2b8cc
- there are compile issues we need to fix Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml |
||
|---|---|---|
| .. | ||
| api/meetings | ||
| applet-jni | ||
| bbb-api-php | ||
| bbb-api-php-legacy | ||
| bbb-callback | ||
| bbb-deskshare-installer | ||
| bbb-deskshare-udp | ||
| bbb-html5-client | ||
| html5-embed | ||
| stress-testing | ||
| webminer | ||