[med-svn] [giira] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/giira

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository giira.

commit 468af7393dcc9772b07498034b15efc7089d5b3d
Merge: 5959005 80f578e
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Sat Feb 8 08:46:42 2014 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/giira

 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --cc debian/changelog
index 08b4f1e,38754c7..7245ac5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,12 @@@
  giira (0.0.20131015-1) UNRELEASED; urgency=low
  
    * Initial release (Closes: #<bug>)
+   TODO: Wiki page http://sourceforge.net/p/giira/wiki/Home/ says that
+     http://www.gnu.org/software/glpk/glpk.html
+   is needed - we need to find out what exact package this might be
  
 +  Olivier Sallou Remarks:
 +
 +  Software needs Cplex to compile. Gonna test to remove references in code to use only glpk.
 +
   -- Andreas Tille <tille at debian.org>  Fri, 07 Feb 2014 11:38:38 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/giira.git