Merge branch 'master' of git@git.opensuse.org:projects/opensuse-updater-kde
authortgoettlicher <tgoettlicher@e230.suse.de>
Sat, 19 Apr 2008 04:15:01 +0000 (06:15 +0200)
committertgoettlicher <tgoettlicher@e230.suse.de>
Sat, 19 Apr 2008 04:15:01 +0000 (06:15 +0200)
commit924baa03d5557c5f840a66d4393dbce0e40b657b
tree2e14edbdbea97f69d0d466128ae5bafe751fb0f8
parent9b390792c4c8fb25663213009f7e952187691b88
parente998a2520598f90656a08156212a1e5cc0f3f226
Merge branch 'master' of git@git.opensuse.org:projects/opensuse-updater-kde

Conflicts:

updater/packagekit/QPackageKitConnector.cpp
updater/packagekit/QPackageKitConnector.h
updater/packagekit/QPackageKitInterface.h
updater/packagekit/packagekit_updater.cpp
updater/packagekit/QPackageKitConnector.cpp
updater/packagekit/QPackageKitConnector.h
updater/packagekit/QPackageKitInterface.h
updater/packagekit/packagekit_updater.cpp
updater/packagekit/packagekit_updater.h