Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:15:14 +0000 (18:15 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:15:14 +0000 (18:15 +0100)
commit1dcc307325260b02e46075bf230b3dd12236cc14
tree261b51ef9ce4c7c2797c52d0763623c646a2bf7f
parent279dd24f0b834b2f5e15aca2fd22bb952df30438
parent1906da15d32340571a04d3d7e2e190bfee26f213
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6f16c9f6c802300b076765d543d96c8b9a8b4da1
src/macextras/qmacfunctions.h
src/macextras/qmacfunctions.mm