[Uml-devel] branches/KDE/4.8/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 1281807 by okellogg:

Merge 1272553:1273090 from trunk but excluding 1272804 and all
UMLWidgetColorPage -> UMLWidgetStylePage related changes (to avoid
changed i18n strings.)


 M  +1 -0      CMakeLists.txt  
 M  +6 -0      basictypes.cpp  
 M  +1 -0      basictypes.h  
 M  +7 -4      codeimport/classimport.cpp  
 M  +2 -2      codeimport/classimport.h  
 M  +5 -0      codeimport/idlimport.cpp  
 M  +13 -3     codeimpwizard/codeimpthread.cpp  
 M  +12 -6     dialogs/umlwidgetcolorpage.h  
 M  +3 -3      icon_utils.cpp  
 M  +2 -2      icon_utils.h  
 M  +1 -1      model_utils.cpp  
 M  +4 -2      uml.cpp  
 A             umlscene.cpp   trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp#1272803 [License: GPL (v2+)]
 M  +4 -1      umlscene.h  
 M  +73 -12    widgets/statewidget.cpp  
 M  +22 -83    widgets/statewidget.h  
 M  +309 -11   widgets/umlwidget.cpp  
 M  +20 -346   widgets/umlwidget.h  


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