Felipe Cecagno 9a7bae79a8 Merge branch '090-new-videodock' into HEAD ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala 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 record-and-playback/deploy.sh		2015-01-28 20:33:28 -02:00
..
images	Merge branch '090-new-videodock' into HEAD	2015-01-28 20:33:28 -02:00
swf	- add default bbb style	2012-12-27 21:36:05 +00:00