[Pkg-wmaker-commits] [wmbubble] 169/207: Merge pull request #1 from rnjacobs/master

[Doug Torrance]

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

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

commit eb57c0bfbc9369be635da9fb832aef908993fc62
Merge: eee6aa3 9be6d0b
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Mon Jul 28 16:12:26 2014 -0600

    Merge pull request #1 from rnjacobs/master
    
    Merge upstream v1.51.

 ChangeLog             |  4 ++++
 Makefile              |  7 +++++++
 bubblemon.c           | 44 ++++++++++++++++++++++++++------------------
 include/bubblemon.h   |  2 ++
 include/sys_include.h |  4 ++++
 sys_freebsd.c         | 23 ++++++++++++++++-------
 wmx11pixmap.h         |  2 ++
 7 files changed, 61 insertions(+), 25 deletions(-)

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