projects
/
platform
/
upstream
/
qttools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e0017be
a6ed9b4
)
Merge remote-tracking branch 'origin/5.4' into 5.5
author
Liang Qi
<liang.qi@theqtcompany.com>
Mon, 25 May 2015 09:03:48 +0000
(11:03 +0200)
committer
Liang Qi
<liang.qi@theqtcompany.com>
Mon, 25 May 2015 09:03:48 +0000
(11:03 +0200)
Conflicts:
.qmake.conf
Change-Id: I47fe486745efad44537255a56087f4ec0a3b2e82
1
2
src/linguist/shared/translator.cpp
patch
|
diff1
|
diff2
|
blob
|
history
tests/auto/linguist/lconvert/tst_lconvert.cpp
patch
|
diff1
|
diff2
|
blob
|
history
tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/linguist/shared/translator.cpp
Simple merge
diff --cc
tests/auto/linguist/lconvert/tst_lconvert.cpp
Simple merge
diff --cc
tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
Simple merge
projects / platform / upstream / qttools.git / commitdiff