Felipe Cecagno 79c3c12256 Merge branch 'merge-presentation-deskshare' into mconf ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js		2016-09-14 14:49:48 -03:00
..
playback/presentation	Merge branch 'merge-presentation-deskshare' into mconf	2016-09-14 14:49:48 -03:00
scripts	Merge branch 'merge-presentation-deskshare' into mconf	2016-09-14 14:49:48 -03:00