diff options
author | Bob Zeleznik <zzzman@gmail.com> | 2020-06-08 20:54:11 -0400 |
---|---|---|
committer | Bob Zeleznik <zzzman@gmail.com> | 2020-06-08 20:54:11 -0400 |
commit | 56e3d5c6958f51f09cc8a2d19e5c00e5bb59093c (patch) | |
tree | 5ff0da85eeb77d086394b783ab01f93534e205e3 /src/client/views/MainView.tsx | |
parent | 3e7cc70f7588c738c34de1d087e1d53b9410d9fe (diff) | |
parent | ef17b488348b0ac9f869878829fc6a60f64f9304 (diff) |
Merge branch 'ink_menu'
Diffstat (limited to 'src/client/views/MainView.tsx')
-rw-r--r-- | src/client/views/MainView.tsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index a1d1b0ece..3677746cd 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -33,6 +33,7 @@ import SharingManager from '../util/SharingManager'; import { Transform } from '../util/Transform'; import { CollectionDockingView } from './collections/CollectionDockingView'; import MarqueeOptionsMenu from './collections/collectionFreeForm/MarqueeOptionsMenu'; +import InkOptionsMenu from './collections/collectionFreeForm/InkOptionsMenu'; import { CollectionLinearView } from './collections/CollectionLinearView'; import { CollectionView, CollectionViewType } from './collections/CollectionView'; import { ContextMenu } from './ContextMenu'; @@ -567,6 +568,7 @@ export class MainView extends React.Component { <RadialMenu /> <PDFMenu /> <MarqueeOptionsMenu /> + <InkOptionsMenu /> <RichTextMenu /> <OverlayView /> <TimelineMenu /> |