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

[Gopala Krishna A]

SVN commit 1058766 by gopala:

SILENT:
Recorded merge of revisions 1009790,1010581,1011859,1020163 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r1009790 | fischer | 2009-08-11 02:32:52 +0530 (Tue, 11 Aug 2009) | 1 line
  
  Fixing some Krazy complaints [qclasses].
........
  r1010581 | fischer | 2009-08-13 03:07:50 +0530 (Thu, 13 Aug 2009) | 1 line
  
  Dialog changed from QDialog to KDialog.
........
  r1011859 | gopala | 2009-08-16 11:21:41 +0530 (Sun, 16 Aug 2009) | 4 lines
  
  Fixed a crash in ActivityDialog due to mismatch between ActivityType enum
  values and the types[] string used in ActivityDialog::setupGeneralPage()
........
  r1020163 | habacker | 2009-09-05 16:47:09 +0530 (Sat, 05 Sep 2009) | 1 line
  
  win32 fix
........


 _M            . (directory)  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,914852-917492,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636,937969-941130,941971,942048-942637,943412,945536-946356,948572-948599,949430,951335-951484,952053-952131,952436-953088,956010-956619,957386,958937,961888,962900,963206-963898,964692,971486,972572-972879,973159,973906-974374,975453,975813-987040,1004964,1006625
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,914852-917492,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636,937969-941130,941971,942048-942637,943412,945536-946356,948572-948599,949430,951335-951484,952053-952131,952436-953088,956010-956619,957386,958937,961888,962900,963206-963898,964692,971486,972572-972879,973159,973906-974374,975453,975813-987040,1004964,1006625,1009790-1020163