Mateus Dalepiane 0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock ... 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/VideoHolder.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml		2015-04-29 12:10:41 -03:00
..
core	Add a function to compare BBB version numbers	2015-04-14 17:33:49 -04:00
matterhorn	After checking we bumped projects version and Flex locales to 0.9.0 with some fixes	2014-08-13 12:20:10 +01:00
presentation	Fix off-by-one error in slide clear events	2015-04-14 17:33:49 -04:00
slides	Delete the 'slides' processing scripts	2014-11-13 11:15:43 -02:00
changelog.md	a log file by meeting in archive phase	2013-04-29 16:03:21 -05:00
deploy.sh	Merge branch '090-new-videodock' into HEAD	2015-01-28 20:33:28 -02:00