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
..
app	Unregistering Java client deskshare stream	2016-09-14 14:01:01 -03:00
applet	Merge branch 'mconf' into bigbluebutton/bigbluebutton@master	2016-03-02 01:19:09 -03:00
common	After checking we bumped projects version and Flex locales to 0.9.0 with some fixes	2014-08-13 12:20:10 +01:00
.gitignore	- cleanup	2010-09-08 17:14:42 -04:00
build.gradle	- update jar to latest red5	2015-08-10 21:32:00 +00:00
settings.gradle	copying from dev branch to trunk	2009-10-23 14:47:31 +00:00
vm-build.sh	Stability issues with module loader in flex client and deskshare/vm-build.sh script for local devel	2010-06-29 05:07:00 +00:00