projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5b3292a
80ba1d6
)
Merge remote-tracking branch 'origin/5.4' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 15:49:54 +0000
(17:49 +0200)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 15:49:54 +0000
(17:49 +0200)
Change-Id: Ib2ef516ab5f5dab86b73fdca5503048e87840280
1
2
src/plugins/resourcepolicy/resourcepolicyint.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/plugins/resourcepolicy/resourcepolicyint.cpp
Simple merge