[graywolf] 04/18: Merge branch 'upstream'

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository graywolf.

commit 8723679ac59480883190d4d6da0be0ae500a2af6
Merge: b251f6b 143add4
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Oct 16 01:44:35 2014 +0200

    Merge branch 'upstream'

 README                |  1 -
 README.md             | 24 ++++++++++++++++++++++++
 src/Ylib/info.h       |  2 +-
 src/twflow/graphics.c |  2 +-
 src/twflow/main.c     |  2 +-
 5 files changed, 27 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/graywolf.git