Skip to content
Snippets Groups Projects
Commit 03717cf7 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.6' 

Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
parents aa0dc33d 4510d1ef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 98 additions and 94 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment