16698f7489
Conflicts: akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.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 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoderObserver.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegConstants.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffprobe/FFProbeCommand.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitor.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitorObserver.java akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessStream.java bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgentObserver.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
50 lines
627 B
Plaintext
50 lines
627 B
Plaintext
.metadata
|
|
.project
|
|
.classpath
|
|
.settings
|
|
.history
|
|
.worksheet
|
|
gen
|
|
**/*.swp
|
|
**/*~.nib
|
|
**/build/
|
|
**/*.pbxuser
|
|
**/*.perspective
|
|
**/*.perspectivev3
|
|
*.xcworkspace
|
|
*.xcuserdatad
|
|
*.iml
|
|
project/*.ipr
|
|
project/*.iml
|
|
project/*.iws
|
|
project/out
|
|
project/*/target
|
|
project/target
|
|
project/*/bin
|
|
project/*/build
|
|
project/*.iml
|
|
project/*/*.iml
|
|
project/.idea
|
|
project/.idea/*
|
|
.idea/
|
|
.DS_Store
|
|
project/.DS_Store
|
|
project/*/.DS_Store
|
|
tm.out
|
|
tmlog*.log
|
|
*.tm*.epoch
|
|
out/
|
|
provisioning/.vagrant
|
|
provisioning/*/.vagrant
|
|
provisioning/*/*.known
|
|
/sbt/akka-patterns-store/
|
|
/daemon/src/build/
|
|
*.lock
|
|
logs/
|
|
tmp/
|
|
build/
|
|
akka-patterns-store/
|
|
lib_managed/
|
|
.cache
|
|
bin/
|