bigbluebutton-Github/bigbluebutton-client/src
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
..
assets remove carriage returns for development on unix 2009-06-02 22:23:56 +00:00
conf New config.template.xml 2010-07-16 17:36:09 +00:00
org/bigbluebutton Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into support-both-ulaw-and-speex 2010-08-04 10:07:45 -04:00
swfobject move into trunk to use as development 2008-11-05 14:52:33 +00:00
BbbTestRunner.mxml updates to include LGPL license in our .mxml files 2009-06-26 15:32:49 +00:00
BbbUnitTests.mxml Removed more unused stuff from the Main app 2010-07-06 09:13:26 +00:00
bigbluebutton_favicon.ico added favicon 2009-05-28 21:56:11 +00:00
BigBlueButton.mxml Finished decoupling the Main app from all other modules. 2010-07-30 23:24:12 +00:00
ChatModule.mxml Merged Neeraj's GSoC Chat Translation into Chat, along with a new User Interface for Chat 2010-08-04 19:47:54 +00:00
DeskShareModule.mxml Deleted old PlaybackModule 2010-07-16 16:28:54 +00:00
DeskshareStandalone.mxml Deleted old PlaybackModule 2010-07-16 16:28:54 +00:00
DynamicInfoModule.mxml Removed more unused stuff from the Main app 2010-07-06 09:13:26 +00:00
ListenersModule.mxml Removed more unused stuff from the Main app 2010-07-06 09:13:26 +00:00
PhoneModule.mxml More cleanup of old code in bbb-client 2010-07-30 18:29:01 +00:00
PresentModule.mxml Now using new way of resolving module dependencies, although there is still issues left to fix 2010-07-15 15:52:46 +00:00
VideoconfModule.mxml Renamed HighlighterModule to WhiteboardModule to match the server code and avoid confusion 2010-07-17 20:05:57 +00:00
VideoconfModule.mxml.orig merged some files 2010-07-16 17:16:42 +00:00
ViewersModule.mxml Made the kick user functionality optional. Now configurable in the config.xml 2010-08-04 20:42:14 +00:00
WhiteboardModule.mxml Renamed HighlighterModule to WhiteboardModule to match the server code and avoid confusion 2010-07-17 20:05:57 +00:00