Felipe Cecagno 2c255dc9ae Merge branch '090-multinotes' into HEAD ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml bigbluebutton-client/resources/prod/layout.xml bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as		2015-01-25 12:12:53 -02:00
..
lib	Merge branch '090-multinotes' into HEAD	2015-01-25 12:12:53 -02:00
swfobject	modify BigBlueButton.html to use swfobject.	2011-09-22 16:48:49 -04:00
3rd-party.html	- add JS API to querly list of presentations, display a presentation, and delete a presentation	2013-06-11 18:19:35 +00:00
avatar.png	- pass avatar in avatarURL during join API call. Have a default avatarURL	2012-12-02 10:57:58 +00:00
bbb-deskshare-applet-0.9.0.jar	- new signed applet valid until oct 30, 2015	2014-10-23 19:55:43 +00:00
bbb-deskshare-applet-unsigned-0.9.0.jar	- new signed applet valid until oct 30, 2015	2014-10-23 19:55:43 +00:00
bbb.gif
BigBlueButton.html	Merge branch 'multinotes' into 090-multinotes	2014-10-31 15:01:29 -02:00
BigBlueButtonTest.html	- play around with melomel	2011-07-21 17:22:25 +00:00
DeskshareStandalone.html	- update deskshare standlone html	2012-04-24 22:20:12 +00:00
EmbedBigBlueButton.html	- add sample embed html	2012-08-05 22:14:01 +00:00
example-info-data.xml
expressInstall.swf	modify BigBlueButton.html to use swfobject.	2011-09-22 16:48:49 -04:00
layout.xml	Merge branch '090-multinotes' into HEAD	2015-01-25 12:12:53 -02:00
locales.xml	show Welsh in the client interface	2013-10-09 20:29:50 +00:00