Fixed conflicts after merge with master
This commit is contained in:
commit
cd6155293b
66 changed files with 7432 additions and 3894 deletions
|
@ -205,7 +205,7 @@ public:
|
|||
bool handle_shortcut(int key);
|
||||
|
||||
bool is_dragging() const;
|
||||
|
||||
|
||||
ClippingPlane get_clipping_plane() const;
|
||||
bool wants_reslice_supports_on_undo() const;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue