[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kwin_scripting (merge)
From:       Rohan Ramdas Prabhu <rohan () rohanprabhu ! com>
Date:       2010-08-14 4:34:35
Message-ID: 20100814043435.C5041AC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1163415 by rohanp:

Merged revisions 1161505,1161745,1162023,1162055,1162103-1162104,1162578,1162777 via \
svnmerge from  svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdebase/workspace/kwin
SVN_MERGE
........
  r1161505 | scripty | 2010-08-10 14:31:14 +0530 (Tue, 10 Aug 2010) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r1161745 | ademmer | 2010-08-11 00:07:32 +0530 (Wed, 11 Aug 2010) | 1 line
  
  call slidingpopups before other window enter/leave effects to fix Yakuake behaviour
........
  r1162023 | scripty | 2010-08-11 12:57:16 +0530 (Wed, 11 Aug 2010) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r1162055 | ademmer | 2010-08-11 14:55:25 +0530 (Wed, 11 Aug 2010) | 1 line
  
  tell other window effects to ignore dashboard window
........
  r1162103 | sebsauer | 2010-08-11 17:25:26 +0530 (Wed, 11 Aug 2010) | 4 lines
  
  Focus tracking for the KWin zoom plugin
  http://reviewboard.kde.org/r/4803/
........
  r1162104 | sebsauer | 2010-08-11 17:27:05 +0530 (Wed, 11 Aug 2010) | 1 line
  
  followup of r1162103; that part wasn't supposed to go in
........
  r1162578 | mlaurent | 2010-08-12 13:10:30 +0530 (Thu, 12 Aug 2010) | 2 lines
  
  Fix forward declaration
........
  r1162777 | graesslin | 2010-08-12 21:56:29 +0530 (Thu, 12 Aug 2010) | 6 lines
  
  Forward port rev 1162775:
  Include the first desktop window which is on current desktop in tabbox.
  This fixes a bug that tabbox switches to a random desktop if there is a desktop \
window on each virtual desktop.  If there is only one desktop window it is on all \
virtual desktops and will be used.  If there is one desktop window per virtual \
desktop only that one will be used.  CCBUG: 247532
........


 _M            . (directory)  
 M  +1 -1      effects/CMakeLists.txt  
 M  +1 -0      effects/_test/kicker/kicker.desktop  
 M  +26 -0     effects/dashboard/dashboard.cpp  
 M  +1 -0      effects/dashboard/dashboard.desktop  
 M  +2 -2      effects/dashboard/dashboard.h  
 M  +1 -0      effects/glide/glide.desktop  
 M  +1 -0      effects/glide/glide_config.desktop  
 M  +2 -0      effects/screenshot/screenshot.desktop  
 M  +1 -1      effects/slidingpopups/slidingpopups.desktop  
 M  +1 -0      effects/zoom/CMakeLists.txt  
 M  +390 -10   effects/zoom/zoom.cpp  
 M  +3 -3      effects/zoom/zoom.desktop  
 M  +40 -0     effects/zoom/zoom.h  
 M  +75 -13    effects/zoom/zoom_config.cpp  
 M  +13 -3     effects/zoom/zoom_config.h  
 A             effects/zoom/zoom_config.ui   \
trunk/KDE/kdebase/workspace/kwin/effects/zoom/zoom_config.ui#1162777  M  +1 -1      \
tabbox.cpp  


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


[prev in list] [next in list] [prev in thread] [next in thread]