OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorErik Verbruggen <erik.verbruggen@nokia.com>
Fri, 31 Jul 2009 14:07:28 +0000 (16:07 +0200)
committerErik Verbruggen <erik.verbruggen@nokia.com>
Fri, 31 Jul 2009 14:07:28 +0000 (16:07 +0200)
commit49672804490cc3b6561432497f4a999a35d6ad07
treed44459cd6e45e6fab9f3010c969bd83629afc68f
parent4a0da2c6f2663d9469bfd929fa682b6df7d42ab7
parent8f869c301cbfca97ed198efa27a5dc207389f22a
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline