bigbluebutton-Github/deskshare/applet
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
..
scripts - upgrade filename to 0.71 2012-04-24 22:22:20 +00:00
src Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare 2012-08-17 19:21:34 +00:00
build.gradle - updating deskshare applet filename to 0.8 2012-06-05 21:09:37 +00:00
build.xml - updating deskshare applet filename to 0.8 2012-06-05 21:09:37 +00:00
tstcert.crt copying from dev branch to trunk 2009-10-23 14:47:31 +00:00