[Uml-devel] branches/work/isi-umbrello

[Thibault Normand]

SVN commit 615788 by tnormand:

#MERGE 615787

Merry Chrismas & Happy New Year !

 M  +3 -3      cervisia/cervisiapart.cpp  
 M  +4 -4      cervisia/cervisiashell.cpp  
 M  +1 -1      cervisia/progressdlg.cpp  
 M  +2 -1      ebn/apidox/src/doxylog2html.pl  
 M  +8 -8      kapptemplate/kapp/app.cpp  
 M  +4 -4      kapptemplate/kapp4/kapp4.cpp  
 M  +6 -6      kapptemplate/kpartapp/app.cpp  
 M  +3 -3      kapptemplate/kpartapp/app_part.cpp  
 M  +1 -2      kbabel/addons/preview/pothumbcreator.cpp  
 M  +19 -19    kbabel/catalogmanager/catalogmanager.cpp  
 M  +0 -2      kbabel/catalogmanager/catalogmanager.h  
 M  +2 -2      kbabel/catalogmanager/catalogmanagerview.cpp  
 M  +2 -2      kbabel/catalogmanager/catalogmanagerview.h  
 M  +3 -2      kbabel/catalogmanager/libcvs/cvsdialog.cpp  
 M  +3 -2      kbabel/catalogmanager/libcvs/cvsdialog.h  
 M  +2 -1      kbabel/catalogmanager/libsvn/svndialog.cpp  
 M  +2 -1      kbabel/catalogmanager/libsvn/svndialog.h  
 M  +0 -43     kbabel/commonui/CMakeLists.txt  
 M  +0 -49     kbabel/datatools/CMakeLists.txt  
 M  +0 -24     kbabel/datatools/accelerators/CMakeLists.txt  
 M  +0 -24     kbabel/datatools/arguments/CMakeLists.txt  
 M  +0 -23     kbabel/datatools/context/CMakeLists.txt  
 M  +0 -23     kbabel/datatools/equations/CMakeLists.txt  
 M  +0 -24     kbabel/datatools/length/CMakeLists.txt  
 M  +0 -23     kbabel/datatools/not-translated/CMakeLists.txt  
 M  +0 -24     kbabel/datatools/pluralforms/CMakeLists.txt  
 M  +0 -23     kbabel/datatools/punctuation/CMakeLists.txt  
 M  +0 -24     kbabel/datatools/regexp/CMakeLists.txt  
 M  +0 -24     kbabel/datatools/setfuzzy/CMakeLists.txt  
 M  +0 -23     kbabel/datatools/whitespace/CMakeLists.txt  
 M  +0 -24     kbabel/datatools/xml/CMakeLists.txt  
 M  +2 -2      kbabel/kbabel/CMakeLists.txt  
 M  +63 -63    kbabel/kbabel/kbabel.cpp  
 D             kbabel/kbabel/kbabeladaptor.cpp  
 D             kbabel/kbabel/kbabeladaptor.h  
 D             kbabel/kbabel/kbabeliface.h  
 A             kbabel/kbabel/kbabelinterface.cpp   trunk/KDE/kdesdk/kbabel/kbabel/kbabelinterface.cpp#614960
 A             kbabel/kbabel/kbabelinterface.h   trunk/KDE/kdesdk/kbabel/kbabel/kbabelinterface.h#614960
 M  +2 -2      kbabel/kbabel/kbabelview.cpp  
 M  +8 -355    kbabel/kbabel/main.cpp  
 M  +1 -1      kbabel/kbabeldict/CMakeLists.txt  
 M  +2 -2      kbabel/kbabeldict/kbabeldictbox.cpp  
 D             kbabel/kbabeldict/kbabeldictiface.h  
 D             kbabel/kbabeldict/modules/dbsearchengine/configure.in.in  
 M  +0 -2      kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp  
 M  +2 -2      kbugbuster/backend/mailsender.cpp  
 M  +0 -1      kbugbuster/gui/cwbugdetailscontainer.cpp  
 M  +1 -1      kbugbuster/gui/cwbugdetailscontainer_base.ui  
 M  +4 -4      kbugbuster/gui/kbbmainwindow.cpp  
 M  +16 -15    kcachegrind/kcachegrind/toplevel.cpp  
 M  +4 -4      kmtrace/CMakeLists.txt  
 M  +5 -5      kompare/kompare_shell.cpp  
 M  +2 -2      kompare/komparepart/kompare_part.cpp  
 M  +2 -2      kompare/libdiff2/komparemodellist.cpp  
 M  +3 -3      kuiviewer/kuiviewer.cpp  
 M  +3 -3      kuiviewer/kuiviewer_part.cpp  
 M  +1 -1      scripts/fixheaders  
 M  +2 -2      scripts/fixuifiles  
 M  +0 -12     scripts/kde-devel-vim.vim  
 M  +2 -3      scripts/kdesvn-buildrc-sample  
 M  +5 -0      scripts/qt4/adapt-to-kde4-api.pl  
 M  +1 -0      umbrello/THANKS  
 M  +1 -1      umbrello/umbrello/dialogs/classifierlistpage.cpp  
 M  +3 -1      umbrello/umbrello/dialogs/codegenerationwizard.cpp  
 M  +1 -1      umbrello/umbrello/dialogs/umlentityattributedialog.cpp  
 M  +14 -0     umbrello/umbrello/umbrelloui.rc  
 M  +23 -9     umbrello/umbrello/uml.h  
 M  +2 -1      umbrello/umbrello/umldoc.cpp