* static method 'mergePath' is now normal method 'merge'
authormishas <mikhail.sobolev@gmail.com>
Thu, 12 Apr 2007 07:13:20 +0000 (07:13 +0000)
committermishas <mikhail.sobolev@gmail.com>
Thu, 12 Apr 2007 07:13:20 +0000 (07:13 +0000)
commitb6a6d94ea3e012d02fb91d935c3f93af74e893e3
tree19994427c5d22e0184b76eae8c2c30d487f1ec17
parent885f4f49b26c8c5922a9860ff7c4f5a34142f14d
 * static method 'mergePath' is now normal method 'merge'
 * added qualifier const the myKeyPath
 * implemented method 'merge'

git-svn-id: file:///svnroot/simple-launcher/trunk@169 3ba93dab-e023-0410-b42a-de7732cf370a
gconf-wrapper.cc
gconf-wrapper.h