[ug] 01/01: Merge remote-tracking branch 'origin/master'

[Ansgar Burchardt]

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

ansgar pushed a commit to branch master
in repository ug.

commit eb4cbecf730b2b59620f2391f276c61eba0d09be
Merge: 55f4276 ed40b70
Author: Ansgar Burchardt <ansgar at 43-1.org>
Date:   Sun Jun 15 11:25:18 2014 +0200

    Merge remote-tracking branch 'origin/master'

 debian/control | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --cc debian/control
index db66641,e2bbdc8..5be0137
--- a/debian/control
+++ b/debian/control
@@@ -26,9 -26,12 +26,12 @@@ Description: software framework for fin
   red/green-refinement, or pure red refinement with hanging nodes. All
   this is fully parallelized and can run on large distributed machines.
   .
+  The version in this package has been built as C++, and with the necessary
+  flags for use with the Dune software system.
+  .
   This package contains the development files.
  
 -Package: libug3.10.0
 +Package: libug3.11.0
  Architecture: any
  Multi-Arch: same
  Depends: ${misc:Depends}, ${shlibs:Depends}

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