[Pkg-wmaker-commits] [wmshutdown] 98/173: Merge branch 'upstream'

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmshutdown.

commit beb003e120ebedf4e9fbe1e41cbae54cae34e268
Merge: 6896fee bca4adb
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sat Jul 26 10:03:02 2014 -0500

    Merge branch 'upstream'

 .gitignore                       |   9 +++
 ChangeLog                        |   4 +
 Makefile                         |  29 -------
 Makefile.am                      |  13 +++
 README                           |  31 ++++---
 configure.ac                     |   8 ++
 wmShutdown.c                     | 170 ---------------------------------------
 wmShutdown.h                     |  16 ----
 wmshutdown-run.1                 | 108 +++++++++++++++++++++++++
 shutdown.c => wmshutdown-run.c   |  32 ++++----
 wmshutdown.1                     | 108 +++++++++++++++++++++++++
 wmshutdown.c                     | 163 +++++++++++++++++++++++++++++++++++++
 wmShutdown.xpm => wmshutdown.xpm |   0
 13 files changed, 444 insertions(+), 247 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmshutdown.git