Skip to content
Snippets Groups Projects
Commit 1b345cfa authored by mae's avatar mae
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 

Conflicts:
	src/plugins/perforce/perforceplugin.cpp
parents 9df34942 6d679fd6
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 32 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