[Pkg-wmaker-commits] [wmbubble] 187/207: Merge remote-tracking branch 'dtorrance/debian-patches'

[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 b9b3a13aaab8a0dac1f80fcba3e327f713ffe08a
Merge: 7ef8b62 70f4662
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Mon Dec 1 19:49:44 2014 -0800

    Merge remote-tracking branch 'dtorrance/debian-patches'

 Makefile              |  10 ++--
 bubblemon.c           |  65 +++++++++++---------
 include/bubblemon.h   |   2 +-
 include/sys_include.h |   3 -
 sys_freebsd.c         | 161 +++++++++++++++++++-------------------------------
 sys_linux.c           |  32 +++++++---
 wmx11pixmap.c         |   1 -
 7 files changed, 126 insertions(+), 148 deletions(-)


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