Felipe Cecagno aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml record-and-playback/core/lib/recordandplayback.rb record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb record-and-playback/core/lib/recordandplayback/generators/events.rb record-and-playback/core/lib/recordandplayback/generators/video.rb record-and-playback/presentation/scripts/publish/presentation.rb		2013-09-24 15:03:44 -03:00
..
edl	Bump the max difference for audio stretch up to 5%	2013-08-26 13:33:23 -04:00
generators	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client	2013-09-24 15:03:44 -03:00
audio_archiver.rb	Update license.	2012-09-04 16:42:13 -05:00
deskshare_archiver.rb	Update license.	2012-09-04 16:42:13 -05:00
edl.rb	Add missing license header to edl.rb	2013-08-26 11:44:22 -04:00
events_archiver.rb	Update license.	2012-09-04 16:42:13 -05:00
presentation_archiver.rb	Update license.	2012-09-04 16:42:13 -05:00
video_archiver.rb	Update license.	2012-09-04 16:42:13 -05:00