Richard Alam cbe0ee60cc - merge some new stuff ... Conflicts: bigbluebutton-web/.gitignore		2012-07-29 16:06:39 +00:00
..
core	- fix http://code.google.com/p/bigbluebutton/issues/detail?id=1087	2012-05-16 19:11:00 +00:00
matterhorn	Create .done file.	2012-05-03 20:30:49 -07:00
presentation	Fix playback race condition	2012-07-17 16:07:36 -04:00
slides	- add support for IE by installing chrome frame for playing back recording	2012-05-14 15:18:56 +00:00
58f4a6b3-cd07-444d-8564-59116cb53974,	Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches.	2012-07-04 12:28:29 -04:00
String	Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches.	2012-07-04 12:28:29 -04:00