From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 Jul 2011 16:21:08 +0000 (+0200)
Subject: Merge branch 'libsatsolver' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=2f58be7548d3eaa772983253f03d077a6242e17e

Merge branch 'libsatsolver' into next
---

2f58be7548d3eaa772983253f03d077a6242e17e
diff --cc make.sh
index 8c08fc34c,30023e599..b73cc72f9
--- a/make.sh
+++ b/make.sh
@@@ -690,10 -689,8 +690,9 @@@ buildipfire() 
    ipfiremake parted
    ipfiremake swig
    ipfiremake python-m2crypto
 +  ipfiremake wireless-regdb
    ipfiremake crda
    ipfiremake libsatsolver
-   ipfiremake python-satsolver
    ipfiremake python-distutils-extra
    ipfiremake python-lzma
    ipfiremake python-progressbar