Richard Alam e04da4042a Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare ... Conflicts: bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.jar deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/NetworkHttpStreamSender.java		2012-08-17 19:21:34 +00:00
..
app	Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare	2012-08-17 19:21:34 +00:00
applet	Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare	2012-08-17 19:21:34 +00:00
common	added SVC2 (Screen Video V2) support to deskshare	2012-07-16 23:01:49 +02:00
.gitignore	- cleanup	2010-09-08 17:14:42 -04:00
build.gradle	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
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