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

[Andi Fischer]

SVN commit 1303602 by fischer:

Sync with trunk.

 M  +0 -1      CMakeLists.txt  
 M  +2 -2      codeimport/kdevcppparser/lexer.cpp  
 M  +196 -108  dialogs/classoptionspage.cpp  
 M  +30 -40    dialogs/classoptionspage.h  
 M  +1 -1      dialogs/classpropdlg.cpp  
 M  +4 -103    dialogs/settingsdlg.cpp  
 M  +2 -26     dialogs/settingsdlg.h  
 M  +1 -1      dialogs/umlviewdialog.cpp  
 M  +10 -0     layouts/activity-export.desktop  
 M  +10 -0     layouts/class-export.desktop  
 M  +11 -0     layouts/class-horizontal.desktop  
 M  +11 -0     layouts/class-vertical.desktop  
 M  +10 -0     layouts/state-export.desktop  
 M  +10 -0     layouts/usecase-default.desktop  
 M  +35 -22    toolbarstate.cpp  
 M  +6 -7      umlscene.cpp  
 M  +11 -11    umlscene.h  


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