OSDN Git Service

Merge branch '2.2' of git@scm.dev.nokia.troll.no:creator/mainline into 2.2
authorThomas Hartmann <Thomas.Hartmann@nokia.com>
Mon, 4 Apr 2011 11:25:27 +0000 (13:25 +0200)
committerThomas Hartmann <Thomas.Hartmann@nokia.com>
Mon, 4 Apr 2011 11:25:27 +0000 (13:25 +0200)
commita8aea374534c140bb0b7046faa42cbf44aea8aa1
tree01c59fb6cb82967f257a52814983782cb75132a1
parent3c172a959d9e42a617bc1fc25193b5b15de39516
parent72c53945a7bff27303ff76df0060bb431f246767
Merge branch '2.2' of git@scm.dev.nokia.troll.no:creator/mainline into 2.2