[sawfish: 3/6] Merge branch 'master' into teika

[Christopher Bratusek <chrisb src gnome org>]

commit 748e93d7d0b447d9dd3da3f1e806145e84eec09c
Merge: 7432445... 4da5ab3...
Author: Teika kazura <teika lavabit com>
Date:   Fri Oct 16 16:54:42 2009 +0900

    Merge branch 'master' into teika
    
    Conflicts:
    	ChangeLog

 ChangeLog                             |   14 ++++++++++++++
 OPTIONS                               |    6 ++++++
 lisp/sawfish/wm/autoload.jl           |    2 +-
 lisp/sawfish/wm/commands/grow-pack.jl |   16 ++++++++--------
 lisp/sawfish/wm/ext/edge-flip.jl      |    3 ++-
 lisp/sawfish/wm/tabs/tab.jl           |    3 ++-
 lisp/sawfish/wm/workspace.jl          |    1 +
 7 files changed, 34 insertions(+), 11 deletions(-)
---
diff --cc ChangeLog
index d4dbe69,4dc686a..6765cdc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,17 +1,25 @@@
 +2009-10-15  Teika kazura <teika lavabit com>
 +	* lisp/sawfish/wm/defaults.jl
 +	* lisp/sawfish/wm/user.jl
 +	* man/faq.texi
 +	* man/news.texi: News and doc that sawfish.wm.defaults is always read, regardless of .sawfishrc existence.
 +
 +	* lisp/sawfish/wm/windows.jl: Bugfix; deleted a wrong quote.
 +
+ 2009-10-15  Christopher Bratusek <zanghar freenet de>
+ 	* lisp/sawfish/wm/autoload.jl
+ 	* lisp/sawfish/wm/commands/grow-pack.jl: make Grow Pack Shrink Yank subgroup of Move Resize
+ 
+ 2009-10-13  Christopher Bratusek <zanghar freenet de>
+ 	* lisp/sawfish/wm/tabs/tab.jl
+ 	* lisp/sawfish/wm/ext/edge-flip.jl
+ 	* lisp/sawfish/wm/workspace.jl: export setter functions
+ 					- raise-tabs-on-hover-setter
+ 					- edge-flip-enable
+ 					- display-ws-name-setter
+ 
+ 	* OPTIONS: updated
+ 
  2009-10-09  Christopher Bratusek <zanghar freenet de>
  	* lisp/sawfish/wm/menus.jl: added "Reload Appsmenu" entry