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
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare	2012-08-17 19:21:34 +00:00
config.xml.template	build client for Flash Player 11	2012-07-31 17:49:09 -05:00