bigbluebutton-Github/bigbluebutton-client
Richard Alam cf865ec52e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into support-both-ulaw-and-speex
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as
2010-08-04 10:07:45 -04:00
..
.settings - upgrade flex sdk to 3.5 2010-07-28 16:02:49 -04:00
build/lib - modify build.xml to use an external locale.xml for supported locales 2010-06-09 17:41:30 -04:00
config - add new directive in nginx conf to expire BigBlueButton.html every minute to prevent caching. 2010-06-14 14:20:09 -04:00
html-template - upgrade flex sdk to 3.5 2010-07-28 16:02:49 -04:00
libs Merged Neeraj's GSoC Chat Translation into Chat, along with a new User Interface for Chat 2010-08-04 19:47:54 +00:00
locale Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-07-18 21:00:32 -05:00
resources Made the kick user functionality optional. Now configurable in the config.xml 2010-08-04 20:42:14 +00:00
src Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into support-both-ulaw-and-speex 2010-08-04 10:07:45 -04:00
tests Finished decoupling the Main app from all other modules. 2010-07-30 23:24:12 +00:00
.actionScriptProperties Merged Neeraj's GSoC Chat Translation into Chat, along with a new User Interface for Chat 2010-08-04 19:47:54 +00:00
.actionScriptProperties.orig merged some files 2010-07-16 17:16:42 +00:00
.flexProperties Refactoring bbb-client Main to not have dependancies on any other modules 2010-07-30 15:55:51 +00:00
.flexProperties.orig merged some files 2010-07-16 17:16:42 +00:00
.gitignore Merge branch 'merging-fs-support' 2010-07-23 16:36:30 -04:00
.project
build.xml Renamed HighlighterModule to WhiteboardModule to match the server code and avoid confusion 2010-07-17 20:05:57 +00:00
LICENSE.txt
README - renamed config.xml to config.xml.dev. The config.xml is changed by each developer and sometimes gets checked-in 2010-06-10 16:05:37 -04:00
vm-build.sh add a script to each module that allows me to build / run in dev mode on my vm without having to remember which method I have to build this module in 2010-05-07 21:53:52 +00:00

see http://code.google.com/p/bigbluebutton

Developing the client
1. Copy src/conf/config.xml.dev to src/cong/config.xml