Skip to content
Snippets Groups Projects
Commit c8bb7e17 authored by con's avatar con
Browse files

Merge commit 'origin/1.3'

Conflicts:
	src/plugins/qt4projectmanager/qt4project.cpp
parents fa348475 2a7439cd
No related branches found
No related tags found
No related merge requests found
Showing
with 202 additions and 69 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment