bigbluebutton-Github/bigbluebutton-client
Richard Alam 36130c1339 Merge branch 'master' into unify-users-and-listeners
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
2013-02-28 19:26:01 +00:00
..
.settings Added support for logo branding in the lower right corner of the client 2010-12-13 20:20:27 +00:00
bin removing an unneeded file 2013-02-12 12:27:12 -05:00
branding - change red button to gray and add play icon to the webcam start button 2013-02-11 00:15:40 +00:00
build/lib - modify build.xml to use an external locale.xml for supported locales 2010-06-09 17:41:30 -04:00
config - forgot to add /fcs/ handler 2012-09-14 19:32:50 +00:00
html-templateBackup Backup before opening red5 up to dev. Still has Line tool. 2012-06-21 23:06:24 -04:00
libs hooked up presentation text 2012-07-24 20:36:29 +00:00
locale Merge branch 'master' into unify-users-and-listeners 2013-02-19 21:31:56 +00:00
resources Merge branch 'master' into unify-users-and-listeners 2013-02-28 19:26:01 +00:00
src Merge branch 'master' into unify-users-and-listeners 2013-02-28 19:26:01 +00:00
.actionScriptProperties added in listener SO support, it should work, but can't test because vm is broken 2013-02-04 18:34:50 -05:00
.actionScriptProperties.orig merged some files 2010-07-16 17:16:42 +00:00
.flexProperties Finished text tool 'options'. 2012-07-09 16:43:03 -04:00
.flexProperties.orig merged some files 2010-07-16 17:16:42 +00:00
.gitignore Merge remote branch 'upstream/master' 2012-08-07 19:56:23 +00:00
.project Added updating tooltip and chat history navigation to Chat Module; keybind is temporary 2012-07-17 19:35:05 +00:00
build.xml Merge branch 'master' into unify-users-and-listeners 2013-02-19 21:31:56 +00:00
LICENSE.txt
README Undoing test change 2012-07-03 20:16:55 +00: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