Markos Calderon 34616c04d8 Merge branch 'layout-module' of https://github.com/mconf/bigbluebutton into mconf-layout-module ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml		2013-03-08 17:04:02 -05:00
..
bbbResources.properties	Merge branch 'layout-module' of https://github.com/mconf/bigbluebutton into mconf-layout-module	2013-03-08 17:04:02 -05:00