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
..
features	Update license.	2012-09-04 16:42:13 -05:00
god	Update license.	2012-09-04 16:42:13 -05:00
lib	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client	2013-09-24 15:03:44 -03:00
resources/raw	- extract metadata from events.xml and generate index.html in publish dir for simple playback	2011-05-24 18:16:54 -04:00
scripts	Fix playback host address	2013-07-29 16:28:04 +00:00
spec	Update license.	2012-09-04 16:42:13 -05:00
Gemfile	Update license.	2012-09-04 16:42:13 -05:00
Gemfile.lock	- update SystemTimer to 1.2.3	2011-05-27 19:45:05 -04:00