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

[Andi Fischer]

SVN commit 1273460 by fischer:

Some small changes to bring trunk and brunch closer together.

 M  +2 -2      cmds/widget/cmd_changeFillColor.cpp  
 U             codeimport/csharp/csharpimport.h  
 M  +3 -3      dialogs/umlwidgetcolorpage.cpp  
 M  +14 -14    listpopupmenu.cpp  
 M  +6 -0      optionstate.h  
 M  +7 -0      umbrello.kcfg  
 M  +5 -0      uml.cpp  
 M  +15 -20    umlscene.cpp  
 M  +3 -3      widgets/floatingtextwidget.cpp  
 M  +1 -2      widgets/floatingtextwidget.h  
 M  +22 -9     widgets/seqlinewidget.cpp  
 M  +1 -2      widgets/seqlinewidget.h  
 M  +1 -2      widgets/statewidget.h  
 M  +3 -3      widgets/widgetbase.h  


http://websvn.kde.org/?view=rev&revision=1273460