Pedro Beschorner Marin 20d21ea313 Unregistering Java client deskshare stream ... Conflicts: deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/red5/DeskshareApplication.scala deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/stream/StreamManager.scala		2016-09-14 14:01:01 -03:00
..
.settings	Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare	2012-08-17 19:21:34 +00:00
src	Unregistering Java client deskshare stream	2016-09-14 14:01:01 -03: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	- update jar to latest red5	2015-08-10 21:32:00 +00:00