83666a7caa
Conflicts: bigbluebutton-client/src/BigBlueButtonMainContainer.mxml bigbluebutton-client/src/org/bigbluebutton/core/services/UsersService.as bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageReceiver.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/PollResultObject.as bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as |
||
|---|---|---|
| .. | ||
| dev | ||
| prod | ||
| config.xml.template | ||
| streams.xml | ||