projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd7f6b8 7017fe8)
Merge remote-tracking branch 'origin/5.3' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 22:30:37 +0000 (00:30 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 22:30:37 +0000 (00:30 +0200)
Change-Id: I9580b6fee5533456feeed20045327c3746a73240

1  2 
src/androiddeployqt/main.cpp patch | diff1 | diff2 | blob | history
src/windeployqt/main.cpp patch | diff1 | diff2 | blob | history

diff --cc src/androiddeployqt/main.cpp
Simple merge
diff --cc src/windeployqt/main.cpp
Simple merge
Domain: UI Framework / Qt;