[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 659172 by okellogg:

merge r656062:658784 from branches/KDE/3.5, fix duplicate includes (EBN Krazy #11)

 M  +2 -1      ChangeLog  
 M  +1 -0      THANKS  
 M  +0 -1      umbrello/classifier.cpp  
 M  +0 -2      umbrello/cmds/cmd_moveWidget.cpp  
 M  +0 -2      umbrello/cmds/cmd_resizeWidget.cpp  
 M  +1 -2      umbrello/cmds/widget/cmd_changeFillColor.cpp  
 M  +11 -0     umbrello/cmds/widget/cmd_changeFontSelection.cpp  
 M  +0 -2      umbrello/cmds/widget/cmd_changeLineColor.cpp  
 M  +1 -2      umbrello/cmds/widget/cmd_changeMulti.cpp  
 M  +0 -2      umbrello/cmds/widget/cmd_set_name.cpp  
 M  +0 -2      umbrello/cmds/widget/cmd_set_txt.cpp  
 M  +57 -18    umbrello/codegenerators/aswriter.cpp  
 M  +12 -2     umbrello/codegenerators/aswriter.h  
 M  +46 -22    umbrello/codegenerators/jswriter.cpp  
 M  +11 -2     umbrello/codegenerators/jswriter.h  
 M  +0 -1      umbrello/codegenobjectwithtextblocks.cpp  
 M  +0 -1      umbrello/dialogs/activitydialog.cpp  
 M  +0 -1      umbrello/dialogs/umloperationdialog.cpp  
 M  +1 -4      umbrello/floatingtextwidget.cpp  
 M  +0 -2      umbrello/objectwidgetcontroller.cpp  
 M  +0 -1      umbrello/umllistviewitem.cpp  
 M  +8 -8      umbrello/umlview.cpp  
 M  +1 -4      umbrello/umlwidgetcontroller.cpp  
 M  +0 -2      umbrello/widget_factory.cpp