More Info

Revision 622468

(Back to digest)
 

Features in Development Tools

Thibault Normand committed changes in /branches/work/isi-umbrello:

Happy new Year to all Kde developers ^^

#SVN MERGE 621464
Conflict solving due to merge in umbrello/umbrello/CMakelist.txt

File Changes

Added 10 files
/branches/work/isi-umbrello
 
/scripts/kde_generate_export_header
 
/cervisia/cvsservice/org.kde.cervisia.cvsloginjob.xml
 
/doc/kompare/settings-diff1.png
 
/doc/kompare/settings-diff2.png
 
/doc/kompare/settings-diff3.png
 
/doc/kompare/settings-diff4.png
 
/doc/kompare/settings-view1.png
 
/doc/kompare/settings-view2.png
 
/ebn/krazy/plugins/inline
 
/ebn/krazy/plugins/Makefile
Deleted 1 files
/branches/work/isi-umbrello/ebn/krazy/plugins/Makefile.PL
Modified 254 files
/branches/work/isi-umbrello
 
/cervisia/addremovedlg.cpp
 
/cervisia/addremovedlg.h
 
/cervisia/addrepositorydlg.cpp
 
/cervisia/addrepositorydlg.h
 
/cervisia/annotatectl.cpp
 
/cervisia/annotatectl.h
 
/cervisia/annotatedlg.cpp
 
/cervisia/annotatedlg.h
 
/cervisia/annotateview.cpp
 
/cervisia/annotateview.h
 
/cervisia/cervisiapart.cpp
 
/cervisia/cervisiapart.h
 
/cervisia/cervisiapart.kcfg
 
/cervisia/cervisiashell.cpp
 
/cervisia/changelogdlg.cpp
 
/cervisia/changelogdlg.h
 
/cervisia/checkoutdlg.cpp
 
/cervisia/checkoutdlg.h
 
/cervisia/CMakeLists.txt
 
/cervisia/commitdlg.cpp
 
/cervisia/commitdlg.h
 
/cervisia/cvsinitdlg.cpp
 
/cervisia/cvsinitdlg.h
 
/cervisia/diffdlg.cpp
 
/cervisia/diffdlg.h
 
/cervisia/diffview.cpp
 
/cervisia/diffview.h
 
/cervisia/editwithmenu.cpp
 
/cervisia/globalignorelist.cpp
 
/cervisia/globalignorelist.h
 
/cervisia/historydlg.cpp
 
/cervisia/historydlg.h
 
/cervisia/logdlg.cpp
 
/cervisia/logdlg.h
 
/cervisia/loglist.cpp
 
/cervisia/loglist.h
 
/cervisia/logmessageedit.cpp
 
/cervisia/logplainview.h
 
/cervisia/main.cpp
 
/cervisia/mergedlg.cpp
 
/cervisia/mergedlg.h
 
/cervisia/misc.cpp
 
/cervisia/misc.h
 
/cervisia/progressdlg.cpp
 
/cervisia/progressdlg.h
 
/cervisia/protocolview.cpp
 
/cervisia/protocolview.h
 
/cervisia/qttableview.cpp
 
/cervisia/repositories.cpp
 
/cervisia/repositorydlg.cpp
 
/cervisia/repositorydlg.h
 
/cervisia/resolvedlg.cpp
 
/cervisia/resolvedlg.h
 
/cervisia/resolvedlg_p.cpp
 
/cervisia/resolvedlg_p.h
 
/cervisia/settingsdlg.cpp
 
/cervisia/settingsdlg.h
 
/cervisia/tagdlg.cpp
 
/cervisia/tagdlg.h
 
/cervisia/updatedlg.cpp
 
/cervisia/updatedlg.h
 
/cervisia/updateview.cpp
 
/cervisia/updateview.h
 
/cervisia/watchdlg.cpp
 
/cervisia/watchdlg.h
 
/cervisia/watchersdlg.cpp
 
/cervisia/watchersdlg.h
 
/kbugbuster/main.cpp
 
/kdeaccounts-plugin/kdeaccountsformat.cpp
 
/kuiviewer/kuiviewer.cpp
 
/kuiviewer/kuiviewer_part.cpp
 
/scheck/scheck.cpp
 
/scripts/CMakeLists.txt
 
/scripts/cxxmetric
 
/scripts/kde-devel-vim.vim
 
/scripts/kdelnk2desktop.py
 
/cervisia/cvsservice/CMakeLists.txt
 
/cervisia/cvsservice/cvsaskpass.cpp
 
/cervisia/cvsservice/cvsjob.cpp
 
/cervisia/cvsservice/cvsjob.h
 
/cervisia/cvsservice/cvsloginjob.cpp
 
/cervisia/cvsservice/cvsloginjob.h
 
/cervisia/cvsservice/cvsservice.cpp
 
/cervisia/cvsservice/cvsservice.h
 
/cervisia/cvsservice/org.kde.cervisia.cvsservice.xml
 
/cervisia/cvsservice/repository.cpp
 
/cervisia/cvsservice/repository.h
 
/doc/kompare/index.docbook
 
/ebn/krazy/foodata
 
/ebn/krazy/install.sh
 
/ebn/krazy/INSTALL.txt
 
/ebn/krazy/krazy
 
/ebn/krazy/krazyebn
 
/kapptemplate/appframework/app.spec
 
/kapptemplate/kapp/app.cpp
 
/kapptemplate/kapp/main.cpp
 
/kapptemplate/kapp4/kapp4.cpp
 
/kapptemplate/kapp4/kapp4.h
 
/kapptemplate/kapp4/kapp4view.h
 
/kbabel/catalogmanager/catalogmanager.cpp
 
/kbabel/catalogmanager/catalogmanager.h
 
/kbabel/catalogmanager/catalogmanagerapp.h
 
/kbabel/catalogmanager/catalogmanagerview.cpp
 
/kbabel/catalogmanager/catalogmanagerview.h
 
/kbabel/catalogmanager/CMakeLists.txt
 
/kbabel/catalogmanager/main.cpp
 
/kbabel/catalogmanager/org.kde.kbabel.catalogmanager.xml
 
/kbabel/common/catalog.cpp
 
/kbabel/common/catalog.h
 
/kbabel/common/catalogfileplugin.h
 
/kbabel/common/CMakeLists.txt
 
/kbabel/common/importplugin.cpp
 
/kbabel/common/msgfmt.cpp
 
/kbabel/common/msgfmt.h
 
/kbabel/common/poinfo.cpp
 
/kbabel/commonui/toolaction.cpp
 
/kbabel/commonui/toolaction.h
 
/kbabel/kbabel/CMakeLists.txt
 
/kbabel/kbabel/contextview.cpp
 
/kbabel/kbabel/headereditor.cpp
 
/kbabel/kbabel/kbabel.cpp
 
/kbabel/kbabel/kbabel.h
 
/kbabel/kbabel/kbabel.kcfg
 
/kbabel/kbabel/kbabelinterface.cpp
 
/kbabel/kbabel/kbabelinterface.h
 
/kbabel/kbabel/kbabelview.cpp
 
/kbabel/kbabel/kbabelview2.cpp
 
/kbabel/kbabel/mymultilineedit.cpp
 
/kbabel/kbabel/org.kde.kbabel.kbabel.xml
 
/kbabel/kbabeldict/CMakeLists.txt
 
/kbabel/kbabeldict/dictionarymenu.cpp
 
/kbabel/kbabeldict/dictionarymenu.h
 
/kbabel/kbabeldict/kbabeldictbox.cpp
 
/kbugbuster/backend/domprocessor.cpp
 
/kbugbuster/backend/mailsender.cpp
 
/kbugbuster/gui/centralwidget.cpp
 
/kbugbuster/gui/cwbugdetailscontainer.cpp
 
/kbugbuster/gui/kbbmainwindow.cpp
 
/kbugbuster/gui/kbbmainwindow.h
 
/kbugbuster/gui/msginputdialog.cpp
 
/kbugbuster/gui/serverconfigdialog.cpp
 
/kbugbuster/gui/serverconfigdialog.h
 
/kcachegrind/kcachegrind/callgraphview.cpp
 
/kcachegrind/kcachegrind/callitem.cpp
 
/kcachegrind/kcachegrind/instritem.cpp
 
/kcachegrind/kcachegrind/sourceitem.cpp
 
/kcachegrind/kcachegrind/toplevel.cpp
 
/kcachegrind/kcachegrind/treemap.cpp
 
/kioslave/svn/svn.cpp
 
/kompare/komparepart/kompare_part.cpp
 
/scripts/kde-emacs/kde-emacs-utils.el
 
/scripts/qt4/adapt-to-kde4-api.pl
 
/umbrello/umbrello/association.cpp
 
/umbrello/umbrello/associationwidget.cpp
 
/umbrello/umbrello/attribute.cpp
 
/umbrello/umbrello/classifier.cpp
 
/umbrello/umbrello/CMakeLists.txt
 
/umbrello/umbrello/codedocument.cpp
 
/umbrello/umbrello/codegenerationpolicy.cpp
 
/umbrello/umbrello/codegenerator.cpp
 
/umbrello/umbrello/entityattribute.cpp
 
/umbrello/umbrello/entitywidget.cpp
 
/umbrello/umbrello/folder.cpp
 
/umbrello/umbrello/import_rose.cpp
 
/umbrello/umbrello/kplayerslideraction.cpp
 
/umbrello/umbrello/kplayerslideraction.h
 
/umbrello/umbrello/main.cpp
 
/umbrello/umbrello/model_utils.cpp
 
/umbrello/umbrello/notewidget.cpp
 
/umbrello/umbrello/operation.cpp
 
/umbrello/umbrello/stereotype.cpp
 
/umbrello/umbrello/textblock.cpp
 
/umbrello/umbrello/toolbarstateassociation.cpp
 
/umbrello/umbrello/uml.cpp
 
/umbrello/umbrello/umlcanvasobject.cpp
 
/umbrello/umbrello/umldoc.cpp
 
/umbrello/umbrello/umllistview.cpp
 
/umbrello/umbrello/umlviewimageexporter.cpp
 
/umbrello/umbrello/umlviewimageexportermodel.cpp
 
/umbrello/umbrello/umlwidgetcontroller.cpp
 
/umbrello/umbrello/widget_utils.cpp
 
/ebn/krazy/plugins/captruefalse
 
/ebn/krazy/plugins/contractions
 
/ebn/krazy/plugins/copyright
 
/ebn/krazy/plugins/doublequote_chars
 
/ebn/krazy/plugins/doxytags.0
 
/ebn/krazy/plugins/emptystrcompare
 
/ebn/krazy/plugins/endswithnewline
 
/ebn/krazy/plugins/explicit
 
/ebn/krazy/plugins/license
 
/ebn/krazy/plugins/nullstrassign
 
/ebn/krazy/plugins/nullstrcompare
 
/ebn/krazy/plugins/qminmax
 
/ebn/krazy/plugins/spelling
 
/ebn/krazy/plugins/TEMPLATE.pl
 
/ebn/krazy/tplugins/constmethods
 
/ebn/krazy/tplugins/doxygenation
 
/ebn/krazy/tplugins/includes
 
/ebn/krazy/tplugins/style
 
/ebn/krazy/tplugins/visibility
 
/kbabel/addons/preview/pothumbcreator.cpp
 
/kbabel/catalogmanager/libcvs/cvshandler.cpp
 
/kbabel/catalogmanager/libsvn/svnhandler.cpp
 
/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
 
/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp
 
/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp
 
/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
 
/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
 
/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
 
/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp
 
/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp
 
/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
 
/umbrello/umbrello/codegenerators/cppwriter.cpp
 
/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
 
/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
 
/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
 
/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
 
/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
 
/umbrello/umbrello/codegenerators/javacodeoperation.cpp
 
/umbrello/umbrello/codegenerators/javawriter.cpp
 
/umbrello/umbrello/codegenerators/perlwriter.cpp
 
/umbrello/umbrello/codegenerators/php5writer.cpp
 
/umbrello/umbrello/codegenerators/pythonwriter.cpp
 
/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
 
/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
 
/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
 
/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
 
/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
 
/umbrello/umbrello/codegenerators/rubywriter.cpp
 
/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
 
/umbrello/umbrello/codegenerators/tclwriter.cpp
 
/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp
 
/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
 
/umbrello/umbrello/codeimport/adaimport.cpp
 
/umbrello/umbrello/codeimport/idlimport.cpp
 
/umbrello/umbrello/codeimport/import_utils.cpp
 
/umbrello/umbrello/codeimport/javaimport.cpp
 
/umbrello/umbrello/codeimport/nativeimportbase.cpp
 
/umbrello/umbrello/codeimport/pascalimport.cpp
 
/umbrello/umbrello/dialogs/assocrolepage.cpp
 
/umbrello/umbrello/dialogs/classifierlistpage.cpp
 
/umbrello/umbrello/dialogs/codeeditor.cpp
 
/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
 
/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
 
/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp
 
/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
 
/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
 
/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
 
/umbrello/umbrello/codeimport/kdevcppparser/ast.h
 
/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
 
/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
 
/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
 
/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
 
/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
265 files changed in total