Felipe Cecagno c79be37591 Merge branch 'mconf-live0.6.4' into base-for-0.6.4 ... 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/UserGraphicHolder.mxml		2015-06-22 17:18:26 -03:00
..
assets	Merge branch 'bigbluebutton/master' into 090-new-videodock	2015-04-29 12:10:41 -03:00
org/bigbluebutton/skins	added a configuration warning system to the flash client	2015-01-15 16:14:49 -08:00
BBBBlack.css	cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code	2015-05-17 23:08:41 -03:00
BBBDefault.css	Merge branch 'mconf-live0.6.4' into base-for-0.6.4	2015-06-22 17:18:26 -03:00