[WindowMaker/el6: 23/23] Merge branch 'master' into el6

[Andreas Bierfert]

commit 3cccaa1a31fbdb705d6cb86306e3743ad562639c
Merge: 4dfda38 d62d99a
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Tue Sep 3 21:08:31 2013 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    3 +-
 WindowMaker-0.80.2-cvs-alt-textfield.patch         |   28 -
 WindowMaker-0.91.0-alt-adialog.patch               |  520 -
 WindowMaker-0.91.0-alt-clipnotext.patch            |   37 -
 WindowMaker-0.91.0-alt-dockhotkeys.patch           |  446 -
 WindowMaker-0.91.0-alt-focus.patch                 |   12 -
 WindowMaker-0.91.0-alt-menutrans.patch             |  167 -
 WindowMaker-0.91.0-alt-mmx.patch                   |   19 -
 WindowMaker-0.91.0-alt-restartscrpt.patch          |   10 -
 WindowMaker-0.91.0-alt-session.patch               |   12 -
 WindowMaker-0.91.0-alt-sowings.patch               |  276 -
 WindowMaker-0.91.0-alt-titlebar.patch              |  186 -
 WindowMaker-0.91.0-alt-vlaad-newbuttons.patch      | 1070 -
 WindowMaker-0.91.0-alt-vlaad-trance.patch          |  321 -
 WindowMaker-0.91.0-hmepas-minimizeall.patch        |  115 -
 WindowMaker-0.91.0-hmepas-swmenu_rclick.patch      |  116 -
 WindowMaker-0.91.0-peter-appicon-bouncer2.patch    |  229 -
 WindowMaker-0.91.0-peter-mouse-placement.patch     |  200 -
 WindowMaker-0.91.0-peter-newappicon.patch          |  193 -
 WindowMaker-0.91.0-sga-moving-add.patch            |  278 -
 WindowMaker-0.91.0-sga-swpanel-customization.patch |   77 -
 WindowMaker-0.91.0-wmcontrib-singleclick.patch     |  168 -
 WindowMaker-0.92.0-alt-newpo.patch                 |   24 -
 WindowMaker-0.92.0-cvs20060123.patch               |26385 --------------------
 WindowMaker-README.newbuttons                      |   34 -
 WindowMaker-application.desktop                    |    6 +
 WindowMaker-gcc41.patch                            |   37 -
 WindowMaker-newbuttons.nextstyle.tiff              |  Bin 4004 -> 0 bytes
 WindowMaker-newbuttons.nextstyle.xpm               |  120 -
 WindowMaker-newbuttons.oldstyle.tiff               |  Bin 4004 -> 0 bytes
 WindowMaker-uk.po                                  |    6 +-
 WindowMaker-wakeup-delayedAction.patch             |   13 -
 WindowMaker-wakeup-dnotify.patch                   |  153 -
 WindowMaker-wakeup-timer.patch                     |   46 -
 WindowMaker-xsession.desktop                       |    5 +
 WindowMaker.desktop                                |    9 -
 WindowMaker.spec                                   |  431 +-
 sources                                            |    3 +-
 38 files changed, 287 insertions(+), 31468 deletions(-)
---