-
- Downloads
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts: bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as bigbluebutton-html5/imports/api/verto/index.js bigbluebutton-html5/imports/ui/components/deskshare/service.js
No related branches found
No related tags found
Showing
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala 1 addition, 1 deletion...scala/org/bigbluebutton/core/JsonMessageSenderActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala 6 additions, 0 deletions...s/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 1 addition, 1 deletion...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala 1 addition, 1 deletion...n/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
- bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java 3 additions, 1 deletion...on/messages/payload/CreateBreakoutRoomRequestPayload.java
- bbb-screenshare/app/deploy.sh 1 addition, 0 deletionsbbb-screenshare/app/deploy.sh
- bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar
- bbb-screenshare/app/jws/lib/ffmpeg.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg.jar
- bbb-screenshare/app/jws/lib/javacpp.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/javacpp.jar
- bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar
- bbb-screenshare/app/jws/screenshare.jnlp 5 additions, 5 deletionsbbb-screenshare/app/jws/screenshare.jnlp
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/ScreenshareStreamListener.java 1 addition, 1 deletion...bluebutton/app/screenshare/ScreenshareStreamListener.java
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java 1 addition, 1 deletion...rg/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java
- bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/jar-ffmpeg.sh 0 additions, 8 deletions...eenshare/jws/native-libs/ffmpeg-windows-x86/jar-ffmpeg.sh
- bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/mjar.sh 0 additions, 7 deletionsbbb-screenshare/jws/native-libs/ffmpeg-windows-x86/mjar.sh
- bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/s.sh 18 additions, 0 deletionsbbb-screenshare/jws/native-libs/ffmpeg-windows-x86/s.sh
- bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh 12 additions, 12 deletions...creenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh
- bbb-screenshare/jws/native-libs/unsigned-jars/javacpp-1.2.jar 0 additions, 0 deletions...screenshare/jws/native-libs/unsigned-jars/javacpp-1.2.jar
- bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh 10 additions, 1 deletionbbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh
- bbb-screenshare/jws/webstart/build.gradle 1 addition, 1 deletionbbb-screenshare/jws/webstart/build.gradle
Loading
Please register or sign in to comment