bigbluebutton-Github/record-and-playback/core
Felipe Cecagno 3440ed0fe3 Merge branch 'v0.81' into record-button
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2014-01-14 14:05:41 -02: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 'v0.81' into record-button 2014-01-14 14:05:41 -02: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 fixing the issue of the whiteboard annotations not being shown in the proper slide; cleaning the environment (events.xml, recorded flag) when the session was recorded but the record button wasn't used 2013-12-02 13:57:05 -02: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