OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorAlessandro Portale <alessandro.portale@nokia.com>
Wed, 15 Apr 2009 14:35:22 +0000 (16:35 +0200)
committerAlessandro Portale <alessandro.portale@nokia.com>
Wed, 15 Apr 2009 14:35:22 +0000 (16:35 +0200)
commitbccfd33dee2682b54554744dfce556834ea18d98
tree68d870ff18a5fae0d1d2159a9f093052b243cbbb
parent1d35bc7003239611f3525e2fa1830867104cac9e
parent800a48f027242d93c08c98a79b365a4632acb322
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline