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

[Oliver Kellogg]

SVN commit 1281897 by okellogg:

Merge 1273529:1273662 from trunk (more pseudostates for state diagrams.)
Exclude new i18n strings at umbrello/listpopupmenu.cpp:1151 ff.


 U             clipboard/umlclipboard.cpp  
 M  +32 -6     listpopupmenu.cpp  
 M  +2 -0      listpopupmenu.h  
 M  +4 -5      object_factory.cpp  
 M  +0 -1      toolbarstate.h  
 M  +28 -5     toolbarstateother.cpp  
 M  +36 -0     umlview.cpp  
 M  +14 -14    umlviewimageexportermodel.cpp  
 M  +7 -1      widgets/associationline.cpp  
 M  +80 -14    widgets/statewidget.cpp  
 M  +5 -3      widgets/statewidget.h  
 M  +0 -2      widgets/umlwidget.cpp  
 M  +2 -2      worktoolbar.cpp  
 M  +2 -2      worktoolbar.h  


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