Felipe Cecagno 5f2f2662af Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml		2014-10-05 22:00:28 -03:00
..
bbbResources.properties	Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1	2014-10-05 22:00:28 -03:00