2097b611ed
Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml record-and-playback/core/scripts/rap-process-worker.rb |
||
---|---|---|
.. | ||
3rd-party.js | ||
adapter.js | ||
bbb_api_bridge.js | ||
bbb_api_cam_preview.js | ||
bbb_api_cam_view.js | ||
bbb_blinker.js | ||
bbb_localization.js | ||
bbb_screenshare.js | ||
bbb_webrtc_bridge_sip.js | ||
bbblogger.js | ||
bigbluebutton.js | ||
diff_match_patch_uncompressed.js | ||
getStats.js | ||
jquery-1.5.1.min.js | ||
jquery-2.1.1.min.js | ||
jquery.cookie.js | ||
jquery.dataTables.min.js | ||
jquery.json-2.4.min.js | ||
jquery.mobile.min.js | ||
jsnlog.min.js | ||
kurento-extension.js | ||
kurento-utils.min.js | ||
shared_notes.js | ||
sip.js | ||
verto_extension.js | ||
verto-min.js | ||
webrtc_stats_bridge.js | ||
weburl_regex.js |