-
- Downloads
Merge remote branch 'upstream/master'
Conflicts: bigbluebutton-client/resources/prod/BigBlueButton.html bigbluebutton-client/src/BigBlueButton.mxml record-and-playback/presentation/playback/presentation/css/bbb.playback.css record-and-playback/presentation/playback/presentation/playback.html record-and-playback/presentation/playback/presentation/playback.js
Showing
- bbb-video/.classpath 19 additions, 8 deletionsbbb-video/.classpath
- bbb-video/build.gradle 1 addition, 1 deletionbbb-video/build.gradle
- bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java 1 addition, 2 deletions...in/java/org/bigbluebutton/app/video/VideoApplication.java
- bbb-video/src/main/webapp/WEB-INF/red5-web.xml 1 addition, 1 deletionbbb-video/src/main/webapp/WEB-INF/red5-web.xml
- bbb-voice/build.gradle 1 addition, 1 deletionbbb-voice/build.gradle
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java 9 additions, 4 deletions...in/java/org/bigbluebutton/voiceconf/red5/Application.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/CallStreamFactory.java 1 addition, 1 deletion...a/org/bigbluebutton/voiceconf/red5/CallStreamFactory.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java 1 addition, 4 deletions...bluebutton/voiceconf/red5/media/AudioBroadcastStream.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java 1 addition, 1 deletion...va/org/bigbluebutton/voiceconf/red5/media/CallStream.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/FlashToSipAudioStream.java 1 addition, 1 deletion...luebutton/voiceconf/red5/media/FlashToSipAudioStream.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java 6 additions, 8 deletions...luebutton/voiceconf/red5/media/SipToFlashAudioStream.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java 1 addition, 1 deletion.../main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ScopeProvider.java 1 addition, 1 deletion...n/java/org/bigbluebutton/voiceconf/sip/ScopeProvider.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java 1 addition, 2 deletions...rc/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java 1 addition, 1 deletion.../java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java
- bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java 1 addition, 4 deletionsbbb-voice/src/main/java/org/red5/app/sip/AudioStream.java
- bbb-voice/src/main/java/org/red5/app/sip/CallStream.java 1 addition, 1 deletionbbb-voice/src/main/java/org/red5/app/sip/CallStream.java
- bbb-voice/src/main/java/org/red5/app/sip/ConnectionClientMethodInvoker.java 1 addition, 1 deletion.../java/org/red5/app/sip/ConnectionClientMethodInvoker.java
- bbb-voice/src/main/java/org/red5/app/sip/ScopeProvider.java 2 additions, 1 deletionbbb-voice/src/main/java/org/red5/app/sip/ScopeProvider.java
- bbb-voice/src/main/java/org/red5/app/sip/SipUser.java 1 addition, 1 deletionbbb-voice/src/main/java/org/red5/app/sip/SipUser.java
Loading
Please register or sign in to comment