Skip to content
GitLab
Commit e15d4c73 authored by Gunnar Sletta's avatar Gunnar Sletta
Browse files

Merge branch 'refactor' 

Conflicts:
	src/xmlpatterns/xmlpatterns.pro

Change-Id: I8d435220281ec372f23c98ab3c15c9a208bacad8
parents 7137785c 024b5623
Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 22 deletions
Supports Markdown
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