-
- Downloads
Merge branch 'fix-context-menu' into fix-context-menu-on-master
Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
Showing
- bigbluebutton-client/src/SharedNotesModule.mxml 1 addition, 3 deletionsbigbluebutton-client/src/SharedNotesModule.mxml
- bigbluebutton-client/src/org/bigbluebutton/common/CustomMdiWindow.as 91 additions, 0 deletions...on-client/src/org/bigbluebutton/common/CustomMdiWindow.as
- bigbluebutton-client/src/org/bigbluebutton/main/views/LogWindow.mxml 2 additions, 2 deletions...on-client/src/org/bigbluebutton/main/views/LogWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml 0 additions, 1 deletion...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml 2 additions, 2 deletions.../src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml 2 additions, 2 deletions.../src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/views/BroadcastWindow.mxml 3 additions, 4 deletions...igbluebutton/modules/broadcast/views/BroadcastWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml 0 additions, 1 deletion...nt/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml 2 additions, 3 deletions.../src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml 3 additions, 4 deletions...dules/deskshare/view/components/DesktopPublishWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml 2 additions, 2 deletions.../modules/deskshare/view/components/DesktopViewWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/example/ExampleChatWindow.mxml 2 additions, 4 deletions.../org/bigbluebutton/modules/example/ExampleChatWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml 0 additions, 2 deletions.../org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/notes/views/NotesWindow.mxml 3 additions, 3 deletions...rc/org/bigbluebutton/modules/notes/views/NotesWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/CreatePollWindow.mxml 2 additions, 2 deletions...bigbluebutton/modules/polling/views/CreatePollWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultWindow.mxml 2 additions, 2 deletions...bluebutton/modules/polling/views/DisplayResultWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollCreateWindow.mxml 2 additions, 4 deletions...bigbluebutton/modules/polling/views/PollCreateWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollMainWindow.mxml 2 additions, 2 deletions...g/bigbluebutton/modules/polling/views/PollMainWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/TakePollWindow.mxml 2 additions, 2 deletions...g/bigbluebutton/modules/polling/views/TakePollWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/UpdatePollWindow.mxml 2 additions, 2 deletions...bigbluebutton/modules/polling/views/UpdatePollWindow.mxml
Loading
Please register or sign in to comment