[graywolf] 02/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 aac103639b3e781347a4f2bfb67fa65847c7c603
Merge: 9ab75b9 6645338
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Oct 14 19:30:58 2014 +0200

    Merge branch 'upstream'

 script/CMakeLists.txt      | 6 +++---
 src/Ylib/CMakeLists.txt    | 2 +-
 src/genrows/CMakeLists.txt | 2 +-
 src/mincut/CMakeLists.txt  | 2 +-
 src/syntax/CMakeLists.txt  | 2 +-
 src/twflow/CMakeLists.txt  | 2 +-
 src/twmc/CMakeLists.txt    | 2 +-
 src/twsc/CMakeLists.txt    | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

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