CVS commit by tjansen: sync M +2 -1 Makefile.am 1.3 M +1 -1 jobgroup.cpp 1.3 --- kdenonbeta/knot/lib/Makefile.am #1.2:1.3 @@ -9,5 +9,6 @@ -libknotlib_la_LIBADD = ../../kdeutil/kde/util/libkdeutil.la ../../kdeutil/kde/ws/util//libkdewsutil.la $(LIB_QT) +libknotlib_la_LIBADD = ../../kdeutil/kde/util/libkdeutil.la ../../kdeutil/kde/xml/libkdexml.la \ + ../../kdeutil/kde/ws/util/libkdewsutil.la $(LIB_QT) libknotlib_la_LDFLAGS = $(all_libraries) --- kdenonbeta/knot/lib/jobgroup.cpp #1.2:1.3 @@ -87,5 +87,5 @@ void JobGroup::result(bool) { SmartPtr JobGroup::finished(bool) { // semi-abstract, to be overloaded - return ; + return 0; }