Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 15:49:54 +0000 (17:49 +0200)
committerFrederik 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