Skip to content
Snippets Groups Projects
Commit 053f9b44 authored by Roberto Raggi's avatar Roberto Raggi
Browse files

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

parents ec769aea 649e0acd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 40 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