[Pkg-wmaker-commits] [wmbubble] 170/207: 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 wmbubble.

commit 533a786ae91def6d80f5ab9dc269fdb514ca48ef
Merge: ed4b7d7 eb57c0b
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Mon Jul 28 17:14:40 2014 -0500

    Merge branch 'upstream'

 ChangeLog             |  4 ++++
 Makefile              | 31 +++++++++++++++++++++++++++++--
 bubblemon.c           | 44 ++++++++++++++++++++++++++------------------
 include/bubblemon.h   |  2 ++
 include/sys_include.h |  4 ++++
 sys_freebsd.c         | 23 ++++++++++++++++-------
 wmbubble.1            |  2 +-
 wmx11pixmap.h         |  2 ++
 8 files changed, 84 insertions(+), 28 deletions(-)

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