Merge branch 'packaging' into QML
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Sat, 13 Aug 2011 10:51:24 +0000 (13:51 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Sat, 13 Aug 2011 10:51:24 +0000 (13:51 +0300)
commitb8fa51413499960a553bc8e55115c4ca4cd5492e
tree0ecd1bc925b19fb795228241f7289bbb51551921
parent761763e2f01dc1d688426a0ffe4d90297bb276a0
parentf59375774499e732576a1f66d7460c1f7cecfe1f
Merge branch 'packaging' into QML

Conflicts:
qtc_packaging/debian_harmattan/README
qtc_packaging/debian_harmattan/changelog
qtc_packaging/debian_harmattan/control
qtc_packaging/debian_harmattan/copyright