[SCM] conflict-driven nogood learning answer set solver branch, master, updated. 6940d3aaf6013a9217d09863720b672f3ebeb755

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 6940d3aaf6013a9217d09863720b672f3ebeb755
Merge: bbd953aac839b1fc9f16ef9f0448ab84b1614630 063ffd632c18313c07be9ae0c2604586f9c46609
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Tue Jan 31 08:06:14 2012 +0100

    Merge branch 'master' of git://git.debian.org/git/debian-science/packages/clasp

diff --combined debian/changelog
index b70be98,91902c8..74f6b96
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +clasp (2.0.5-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Sun, 29 Jan 2012 20:27:04 +0100
 +
+ clasp (2.0.4-1ubuntu1~oneiric1) oneiric; urgency=low
+ 
+   * Upload to ppa:~tkren/asp.
+ 
+  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Wed, 30 Nov 2011 06:36:04 +0100
+ 
  clasp (2.0.4-1) unstable; urgency=low
  
    * New upstream release.

-- 
conflict-driven nogood learning answer set solver