OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>
Tue, 7 Sep 2010 11:22:39 +0000 (13:22 +0200)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>
Tue, 7 Sep 2010 11:22:39 +0000 (13:22 +0200)
commit3724b59e24c640269217b854ea368d474207732b
tree52725fe84f3b2968015acdcd6398918b16353a4f
parentf52976435b943ace98796a3f23ea3f8a828082a2
parent26f5aaef8f337bc0a49e3eec6afd3d2dbb648e91
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline