Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Dolphin
Manage
Activity
Members
Labels
Plan
Issues
15
Issue boards
Milestones
Wiki
Bugzilla
Code
Merge requests
35
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
System
Dolphin
Commits
dc7b8316
Commit
dc7b8316
authored
9 years ago
by
Harald Sitter
Browse files
Options
Downloads
Plain Diff
Merge branch 'Applications/15.08'
Conflicts: CMakeLists.txt
parents
03adb27d
31f0acc7
No related branches found
No related tags found
Loading
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+5
-1
5 additions, 1 deletion
CMakeLists.txt
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
src/main.cpp
+2
-1
2 additions, 1 deletion
src/main.cpp
src/panels/places/placesitemmodel.cpp
+3
-5
3 additions, 5 deletions
src/panels/places/placesitemmodel.cpp
with
11 additions
and
8 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment