Pedro Beschorner Marin 324ed1b9ab Merge branch 'auto-reconnect' into mconf-live0.6.4 ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/branding/default/style/css/assets/images/icons-license.txt bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as		2015-07-03 14:35:08 +00:00
..
assets	Merge branch 'auto-reconnect' into mconf-live0.6.4	2015-07-03 14:35:08 +00: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 'auto-reconnect' into mconf-live0.6.4	2015-07-03 14:35:08 +00:00