Vladimír Čunát 9443129b08 Merge master into stdenv-updates ... Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)		2014-01-04 18:34:53 +01:00
..
default.nix	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00
zsnes-1.51-libpng15.patch	zsnes: patches for modern gcc & libpng	2013-10-11 01:10:41 +02:00
zsnes.patch	zsnes: patches for modern gcc & libpng	2013-10-11 01:10:41 +02:00