Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Plugin-Merge
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
Plugin-Merge
Compare Revisions
e5e3c6ed16bb6424394de4e84405935fc4ec4a67...6538b9b177f9423b08e0c3e5545a497f2c9b4aae
Source
6538b9b177f9423b08e0c3e5545a497f2c9b4aae
Select Git revision
...
Target
e5e3c6ed16bb6424394de4e84405935fc4ec4a67
Select Git revision
Compare
Commits (1)
Adaptions for autouic
· 6538b9b1
Jan Möbius
authored
Jan 10, 2019
6538b9b1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
MergeToolbox.hh
MergeToolbox.hh
+1
-2
No files found.
MergeToolbox.hh
View file @
6538b9b1
...
@@ -41,8 +41,7 @@
...
@@ -41,8 +41,7 @@
#pragma once
#pragma once
#include "ui_toolbox.hh"
#include "ui_toolbox.h"
#include <QtGui>
class
MergeToolBox
:
public
QWidget
,
public
Ui
::
MergeTool
class
MergeToolBox
:
public
QWidget
,
public
Ui
::
MergeTool
{
{
...
...