Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
..
2015-01-13 22:33:49 +01:00
2014-12-26 12:28:15 -05:00
2015-01-19 09:31:35 +00:00
2015-01-18 11:17:49 +01:00
2015-01-18 11:17:49 +01:00
2015-02-10 22:08:01 +01:00
2015-01-02 00:01:40 +01:00
2015-01-07 12:56:59 +01:00
2015-01-13 22:33:49 +01:00
2015-01-20 09:30:09 +01:00
2014-12-25 11:44:33 +01:00
2015-01-19 14:50:52 +01:00
2015-01-01 15:45:30 +01:00
2015-01-15 00:11:14 +01:00
2015-02-07 20:29:28 -08:00
2015-01-27 14:04:53 +01:00