Commit Graph

3 Commits

Author SHA1 Message Date
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
Ralf Sippl
a709b8ebcf 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
Richard Alam
e68520a3c6 - add license header for deskshare 2010-11-06 11:17:57 -04:00