Commit 655f8dd6 authored 8 years ago by gcampes

Fix merge conflicts

parents 0aa6022c 224114c8

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

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 8 additions, 3 deletions

...s/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala 1 addition, 1 deletion

.../src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala 2 additions, 2 deletions

...apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 2 additions, 2 deletions

...rc/main/scala/org/bigbluebutton/core/api/InMessages.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 32 additions, 30 deletions

...n/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala 4 additions, 1 deletion

...scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala 2 additions, 1 deletion

...n/core/pubsub/senders/MeetingMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomJoinURLPayload.java 15 additions, 11 deletions

...uebutton/messages/payload/BreakoutRoomJoinURLPayload.java
bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomsRequestPayload.java 1 addition, 4 deletions

...n/messages/payload/CreateBreakoutRoomsRequestPayload.java
bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/RequestBreakoutJoinURLPayload.java 1 addition, 3 deletions

...utton/messages/payload/RequestBreakoutJoinURLPayload.java
bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsRequestTest.java 2 additions, 2 deletions

...igbluebutton/messages/CreateBreakoutRoomsRequestTest.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/SpeexFlashToSipTranscoderImp.java 31 additions, 33 deletions

...f/red5/media/transcoder/SpeexFlashToSipTranscoderImp.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java 2 additions, 1 deletion

...rg/bigbluebutton/red5/client/UserClientMessageSender.java
bigbluebutton-client/resources/config.xml.template 1 addition, 1 deletion

bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/main/model/LayoutOptions.as 68 additions, 43 deletions

...-client/src/org/bigbluebutton/main/model/LayoutOptions.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as 2 additions, 2 deletions

...ent/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml 17 additions, 7 deletions

...client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as 1 addition, 1 deletion

...g/bigbluebutton/modules/users/services/MessageReceiver.as

with 194 additions and 150 deletions

Please register or to comment