[Uml-devel] branches/work/isi-umbrello
Caroline Bourdeu d'Aguerre
cbda at free.fr
Fri Feb 2 19:26:49 UTC 2007
SVN commit 629441 by bourdeu:
SVN MERGE 629404. I have to pass by 3 merges (621464:622468, 622468:625290 and 625292:629404)
M +5 -76 cervisia/CMakeLists.txt
M +3 -1 cervisia/addrepositorydlg.cpp
M +3 -3 cervisia/addrepositorydlg.h
M +4 -1 cervisia/annotatedlg.cpp
M +3 -3 cervisia/annotatedlg.h
M +3 -2 cervisia/annotateview.cpp
M +2 -2 cervisia/annotateview.h
D cervisia/cervisia.1.in
M +170 -73 cervisia/cervisiapart.cpp
M +1 -1 cervisia/cervisiapart.h
M +14 -10 cervisia/cervisiashell.cpp
M +6 -2 cervisia/changelogdlg.cpp
M +3 -3 cervisia/changelogdlg.h
M +6 -5 cervisia/checkoutdlg.cpp
M +5 -5 cervisia/checkoutdlg.h
M +4 -2 cervisia/commitdlg.cpp
M +2 -2 cervisia/commitdlg.h
M +2 -0 cervisia/cvsservice/cvsaskpass.cpp
M +9 -4 cervisia/cvsservice/cvsjob.cpp
M +10 -9 cervisia/cvsservice/cvsloginjob.cpp
M +9 -5 cervisia/cvsservice/cvsservice.cpp
M +2 -1 cervisia/cvsservice/repository.cpp
M +3 -1 cervisia/diffdlg.cpp
M +3 -3 cervisia/diffdlg.h
M +4 -3 cervisia/diffview.cpp
M +4 -4 cervisia/diffview.h
M +4 -2 cervisia/historydlg.cpp
M +3 -2 cervisia/historydlg.h
M +8 -5 cervisia/logdlg.cpp
M +2 -2 cervisia/logdlg.h
M +3 -5 cervisia/loglist.cpp
M +3 -3 cervisia/loglist.h
M +16 -13 cervisia/main.cpp
M +22 -24 cervisia/progressdlg.cpp
M +4 -4 cervisia/progressdlg.h
M +18 -16 cervisia/protocolview.cpp
M +3 -5 cervisia/protocolview.h
M +6 -3 cervisia/repositories.cpp
M +16 -8 cervisia/repositorydlg.cpp
M +6 -6 cervisia/repositorydlg.h
M +2 -1 cervisia/resolvedlg.cpp
M +3 -2 cervisia/resolvedlg.h
M +3 -1 cervisia/resolvedlg_p.cpp
M +3 -3 cervisia/resolvedlg_p.h
M +36 -17 cervisia/settingsdlg.cpp
M +6 -5 cervisia/settingsdlg.h
M +1 -1 cervisia/tagdlg.cpp
M +5 -6 cervisia/updateview.cpp
M +3 -3 cervisia/updateview.h
M +4 -2 cervisia/watchersdlg.cpp
M +3 -3 cervisia/watchersdlg.h
M +14 -5 cmake/scripts/am2cmake
M +0 -16 doc/CMakeLists.txt
M +2 -13 doc/cervisia/CMakeLists.txt
M +39 -39 doc/cervisia/index.docbook
M +1 -1 doc/kapptemplate/CMakeLists.txt
M +2 -13 doc/kbabel/CMakeLists.txt
M +2 -13 doc/kbugbuster/CMakeLists.txt
M +1 -2 doc/kbugbuster/index.docbook
M +2 -13 doc/kcachegrind/CMakeLists.txt
M +1 -1 doc/kcachegrind/index.docbook
M +2 -13 doc/kompare/CMakeLists.txt
M +1 -1 doc/scripts/CMakeLists.txt
M +2 -13 doc/scripts/kdesvn-build/CMakeLists.txt
M +2 -13 doc/umbrello/CMakeLists.txt
M +4 -0 ebn/apidox/install.sh
M +5 -2 ebn/apidox/src/doxylog2html.pl
M +1 -0 ebn/krazy/plugins/Makefile
M +2 -2 ebn/krazy/plugins/doxytags.0
M +9 -7 ebn/krazy/plugins/explicit
M +1 -1 ebn/krazy/src/passbyvalue/passbyvalue.cpp
M +2 -2 kapptemplate/kpartapp/app_part.cpp
M +1 -1 kapptemplate/kpartplugin/plugin_app.cpp
M +12 -10 kbabel/catalogmanager/catalogmanager.cpp
M +1 -1 kbabel/catalogmanager/catalogmanager.h
M +2 -2 kbabel/catalogmanager/catalogmanagerview.cpp
M +3 -2 kbabel/catalogmanager/findinfilesdialog.cpp
M +2 -1 kbabel/catalogmanager/main.cpp
M +2 -2 kbabel/catalogmanager/markpatterndialog.cpp
M +4 -1 kbabel/common/catalog.cpp
M +2 -2 kbabel/common/catalog.h
M +1 -0 kbabel/common/kbproject.cpp
M +10 -1 kbabel/common/kbprojectmanager.cpp
M +2 -0 kbabel/common/kbprojectmanager.h
M +1 -1 kbabel/common/tagextractor.cpp
M +3 -2 kbabel/commonui/finddialog.cpp
M +3 -2 kbabel/commonui/roughtransdlg.cpp
M +1 -1 kbabel/commonui/toolaction.cpp
M +1 -0 kbabel/kbabel/charselectview.cpp
M +3 -2 kbabel/kbabel/headereditor.cpp
M +27 -19 kbabel/kbabel/kbabel.cpp
M +2 -2 kbabel/kbabel/kbabel.h
M +8 -7 kbabel/kbabel/kbabelinterface.cpp
M +5 -4 kbabel/kbabel/kbabelview.cpp
M +1 -0 kbabel/kbabel/kbcharselect.cpp
M +1 -1 kbabel/kbabel/kbhighlighting.cpp
M +2 -1 kbabel/kbabel/main.cpp
M +3 -2 kbabel/kbabel/spelldlg.cpp
M +3 -2 kbabel/kbabeldict/kbabeldict.cpp
M +5 -4 kbabel/kbabeldict/kbabeldictbox.cpp
M +4 -4 kbabel/kbabeldict/kbabeldictview.cpp
M +2 -1 kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
M +5 -5 kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
M +3 -3 kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h
M +2 -1 kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
M +4 -4 kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
M +3 -3 kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h
M +5 -5 kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
M +3 -3 kbabel/kbabeldict/modules/poauxiliary/pa_factory.h
M +2 -2 kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
M +5 -5 kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
M +3 -3 kbabel/kbabeldict/modules/pocompendium/pc_factory.h
M +2 -2 kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
M +5 -5 kbabel/kbabeldict/modules/tmx/pc_factory.cpp
M +3 -3 kbabel/kbabeldict/modules/tmx/pc_factory.h
M +2 -2 kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
M +1 -0 kcachegrind/kcachegrind/callgraphview.cpp
M +1 -0 kcachegrind/kcachegrind/callmapview.cpp
M +1 -0 kcachegrind/kcachegrind/configuration.cpp
M +1 -0 kcachegrind/kcachegrind/instrview.cpp
M +1 -0 kcachegrind/kcachegrind/multiview.cpp
M +1 -0 kcachegrind/kcachegrind/partselection.cpp
M +1 -0 kcachegrind/kcachegrind/tabview.cpp
M +15 -14 kcachegrind/kcachegrind/toplevel.cpp
M +1 -0 kcachegrind/kcachegrind/traceitemview.cpp
M +1 -0 kcachegrind/kcachegrind/treemap.cpp
M +1 -0 kcachegrind/kcachegrind/treemap.h
M +2 -2 kioslave/svn/svn.cpp
M +1 -1 kmtrace/demangle.cpp
M +2 -2 kmtrace/kmtrace.cpp
M +1 -1 kmtrace/match.cpp
M +5 -5 kompare/komparenavtreepart/komparenavtreepart.cpp
M +3 -3 kompare/komparenavtreepart/komparenavtreepart.h
M +3 -3 kompare/komparepart/kompare_part.cpp
M +2 -2 kompare/kompareurldialog.cpp
M +1 -0 kompare/libdialogpages/viewsettings.cpp
M +2 -2 kstartperf/kstartperf.cpp
M +2 -2 kuiviewer/kuiviewer_part.cpp
M +2 -2 kunittest/guimodrunner.cpp
M +41 -4 scripts/cmakelint.pl
M +1 -1 scripts/extractrc
M +1 -1 scripts/fixheaders
M +25 -0 scripts/kde-devel-gdb
M +35 -3 scripts/kde-devel-vim.vim
M +5 -6 scripts/kde-emacs/kde-emacs-utils.el
M +1 -1 scripts/kde-emacs/kde-emacs-vars.el
M +0 -1 scripts/kde-emacs/klaralv.el
M +5 -0 umbrello/ChangeLog
M +1 -1 umbrello/VERSION
M +8 -7 umbrello/umbrello/CMakeLists.txt
M +2 -2 umbrello/umbrello/codeimport/adaimport.cpp
M +1 -1 umbrello/umbrello/codeimport/idlimport.cpp
M +3 -3 umbrello/umbrello/codeimport/javaimport.cpp
M +3 -3 umbrello/umbrello/codeimport/nativeimportbase.cpp
M +1 -1 umbrello/umbrello/codeimport/nativeimportbase.h
M +2 -2 umbrello/umbrello/codeimport/pascalimport.cpp
M +1 -1 umbrello/umbrello/codeimport/pythonimport.cpp
M +2 -2 umbrello/umbrello/dialogs/activitydialog.h
M +1 -1 umbrello/umbrello/dialogs/assocgenpage.cpp
M +1 -1 umbrello/umbrello/dialogs/overwritedialogue.cpp
M +1 -1 umbrello/umbrello/dialogs/overwritedialogue.h
M +0 -3 umbrello/umbrello/dialogs/settingsdlg.h
M +2 -2 umbrello/umbrello/dialogs/statedialog.h
D umbrello/umbrello/docgenerators/CMakeLists.txt
M +3 -3 umbrello/umbrello/docgenerators/docbookgenerator.cpp
M +2 -2 umbrello/umbrello/docgenerators/docbookgenerator.h
M +5 -6 umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
M +1 -1 umbrello/umbrello/docgenerators/xhtmlgenerator.h
M +5 -5 umbrello/umbrello/petaltree2uml.cpp
M +2 -2 umbrello/umbrello/plugin.h
M +4 -0 umbrello/umbrello/toolbarstateassociation.cpp
M +13 -13 umbrello/umbrello/uml.cpp
M +3 -2 umbrello/umbrello/uml.h
M +3 -4 umbrello/umbrello/umllistviewitem.cpp
More information about the umbrello-devel
mailing list