projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b6a627 1b02287)
Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:10:54 +0000 (16:10 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:10:54 +0000 (16:10 +0200)
Conflicts:
src/assistant/assistant/assistant.pro

Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0


Trivial merge
Domain: UI Framework / Qt;