OSDN Git Service

Merge branch '1.3'
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Thu, 7 Jan 2010 08:09:45 +0000 (09:09 +0100)
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Thu, 7 Jan 2010 08:09:45 +0000 (09:09 +0100)
commitae535daa20eecc9feb07941caf65f2966fb8f9b5
tree68952bf75486eaef712013c7f4556f67c1e188e0
parent138b12b5dc8e1b969dd81685f402b7f75c7a76dd
parentfdbdf50ce44871aae22a4e01f4366caafa643101
Merge branch '1.3'

Conflicts:
src/plugins/git/gitplugin.cpp
src/plugins/git/gitplugin.cpp