Felipe Cecagno bb330cf0a2 Merge branch '090-deskshare-window' into mconf-live0.6.2 ... Conflicts: bigbluebutton-client/resources/prod/layout.xml bigbluebutton-client/resources/prod/lib/deployJava.js bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml		2015-03-02 00:25:02 -03:00
..
images	Merge branch '090-deskshare-window' into mconf-live0.6.2	2015-03-02 00:25:02 -03:00
swf	- add default bbb style	2012-12-27 21:36:05 +00:00