OSDN Git Service

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
authorKai Koehne <kai.koehne@nokia.com>
Fri, 8 Oct 2010 12:49:05 +0000 (14:49 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Fri, 8 Oct 2010 12:49:05 +0000 (14:49 +0200)
commit21f13efcbfb3be333d818a78703c1ac530f7050d
treed2a6c417dbcf15348430f22f06878af127e907ba
parent632343cb6b04d71128d8f16105d597b09b1a8e19
parent89e66d7042c4f1ad25bc9a2487b82d97e6e32d9e
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline