Merge master into this PR

2014-08-12 21:16:47 +02:00
parent 75518f748f 56f409a446
commit 54c18db1ca
3251 changed files with 24134 additions and 12186 deletions
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://enblend.sourceforge.net/;
    description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }