[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 605985 by okellogg:

merge branches/KDE/3.5 r604531:605965

 M  +1 -0      ChangeLog  
 M  +2 -5      umbrello/association.cpp  
 M  +1 -6      umbrello/classifier.cpp  
 M  +4 -6      umbrello/codegenerators/classifierinfo.cpp  
 M  +3 -0      umbrello/dialogs/classgenpage.cpp  
 M  +0 -2      umbrello/folder.cpp  
 M  +14 -2     umbrello/model_utils.cpp  
 M  +1 -1      umbrello/model_utils.h  
 M  +5 -10     umbrello/package.cpp  
 M  +1 -1      umbrello/package.h  
 M  +0 -1      umbrello/petaltree2uml.cpp  
 M  +4 -2      umbrello/umlcanvasobject.cpp  
 M  +14 -21    umbrello/umldoc.cpp  
 M  +0 -23     umbrello/umldoc.h  
 M  +3 -0      umbrello/umllistview.cpp  
 M  +18 -25    umbrello/umlobject.cpp  
 M  +1 -1      umbrello/uniqueid.cpp