BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
371243dbe6
bigbluebutton-Github/bigbluebutton-client/branding/default
History
Felipe Cecagno 371243dbe6 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
2013-06-28 16:09:11 -03:00
..
style/css Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 2013-06-28 16:09:11 -03:00
build.xml - add default bbb style 2012-12-27 21:36:05 +00:00
README - add README 2012-12-27 21:46:06 +00:00

README 

 This is the default BigBlueButton style.