719ef1377a
Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.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 bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java bbb-video/src/main/java/org/bigbluebutton/app/video/converter/VideoRotator.java bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/resources/prod/MconfLive.html bigbluebutton-client/src/org/bigbluebutton/common/Images.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml bigbluebutton-config/bin/bbb-conf record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb record-and-playback/core/lib/recordandplayback/generators/video.rb record-and-playback/core/scripts/rap-worker.rb record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js record-and-playback/presentation/scripts/process/presentation.rb record-and-playback/presentation/scripts/publish/presentation.rb |
||
|---|---|---|
| .. | ||
| recordandplayback | ||
| custom_hash.rb | ||
| recordandplayback.rb | ||