Merge branch 'upgrade-to-red5-1.0.2-M1' into merge-with-upgrade-red5-branch
Showing
- bbb-voice/build.gradle 24 additions, 17 deletionsbbb-voice/build.gradle
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java 3 additions, 2 deletions...bluebutton/voiceconf/red5/media/AudioBroadcastStream.java
- bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java 2 additions, 2 deletionsbbb-voice/src/main/java/org/red5/app/sip/AudioStream.java
- bigbluebutton-apps/build.gradle 28 additions, 38 deletionsbigbluebutton-apps/build.gradle
- bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java 0 additions, 1 deletion...nce/service/presentation/PresentationMessageListener.java
- bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml 3 additions, 0 deletions...ebutton-apps/src/main/resources/logback-bigbluebutton.xml
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 1 addition, 4 deletions...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala 0 additions, 8 deletions...n/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 1 addition, 4 deletions...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala 1 addition, 3 deletions.../src/main/scala/org/bigbluebutton/core/MeetingActor.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp.scala 0 additions, 2 deletions...main/scala/org/bigbluebutton/core/apps/chat/ChatApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala 0 additions, 2 deletions.../scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutInGateway.scala 0 additions, 4 deletions.../org/bigbluebutton/core/apps/layout/LayoutInGateway.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/poll/PollApp.scala 0 additions, 2 deletions...main/scala/org/bigbluebutton/core/apps/poll/PollApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp.scala 0 additions, 3 deletions...igbluebutton/core/apps/presentation/PresentationApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala 10 additions, 22 deletions...s/presentation/red5/PresentationClientMessageSender.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala 1 addition, 4 deletions...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala 0 additions, 2 deletions...in/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala 0 additions, 2 deletions...rg/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala 2 additions, 8 deletions.../bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
Loading
Please register or sign in to comment