-
- Downloads
Merge remote branch 'upstream/master' into more-client-fixes
Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
No related branches found
No related tags found
Showing
- bigbluebutton-client/locale/en_US/bbbResources.properties 17 additions, 1 deletionbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml 4 additions, 2 deletions...ent/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as 4 additions, 2 deletions...button/modules/participants/business/ParticipantsProxy.as
- bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml 4 additions, 4 deletions...ebutton/modules/participants/views/MediaItemRenderer.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml 1 addition, 1 deletion...uebutton/modules/participants/views/NameItemRenderer.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml 11 additions, 11 deletions...button/modules/participants/views/ParticipantsWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml 1 addition, 1 deletion...button/modules/participants/views/StatusItemRenderer.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as 14 additions, 3 deletions.../bigbluebutton/modules/present/managers/PresentManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml 10 additions, 2 deletions...uebutton/modules/present/ui/views/PresentationWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml 4 additions, 2 deletions...org/bigbluebutton/modules/present/ui/views/SlideView.mxml
Loading
Please register or sign in to comment