Pedro Beschorner Marin d6b1dd09b9 Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode ... Conflicts: akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VideoApp.scala		2017-06-08 18:57:37 +00:00
..
.settings	Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare	2012-08-17 19:21:34 +00:00
src	Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode	2017-06-08 18:57:37 +00:00
.classpath.old	- add license header for deskshare	2010-11-06 11:17:57 -04:00
.gitignore	a couple of fixes that enabled an upgrade to Scala 2.9.2 and make deskshare debuggable in Eclipse (w. Scala IDE)	2012-07-10 22:22:05 +02:00
build.gradle	Included a redis pub service in deskshare	2017-06-06 20:47:33 +00:00