projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a865832 08d0cb6)
Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:33:37 +0000 (14:33 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:33:37 +0000 (14:33 +0200)
Change-Id: Ie422cd4d1e634ac7bbd37e98b6cdffa2e75ab58e

1  2 
src/linguist/lupdate/main.cpp patch | diff1 | diff2 | blob | history
src/qtconfig/mainwindow.cpp patch | diff1 | diff2 | blob | history

diff --cc src/linguist/lupdate/main.cpp
Simple merge
diff --cc src/qtconfig/mainwindow.cpp
Simple merge
Domain: UI Framework / Qt;