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
..
main	Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare	2012-08-17 19:21:34 +00:00
test	- setup testng for deskshare server app	2011-03-23 15:38:32 -04:00