3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs
Jakob Gillich 5e5ecb7b6f fish: fix merge conflict
patches got duplicated
2016-01-05 23:32:29 +01:00
..
applications Merge pull request #12119 from devhell/mediainfo 2016-01-06 01:29:15 +03:00
build-support fetchgitLocal: make it work in submodules 2016-01-04 15:09:00 -08:00
data cantarell_fonts: update from 0.0.16 to 0.0.17 2016-01-03 20:51:14 +00:00
desktops system-config-printer: align attrname with pkgname 2016-01-03 15:18:04 +01:00
development Merge pull request #12119 from devhell/mediainfo 2016-01-06 01:29:15 +03:00
games anki: disable version check 2016-01-05 21:44:54 +01:00
misc vimPlugins: update 2016-01-05 2016-01-05 19:58:30 +03:00
os-specific mcelog: 128 -> 129 2016-01-05 20:22:35 +01:00
servers xorgReplacements: remove this ancient cruft 2016-01-04 10:31:58 +01:00
shells fish: fix merge conflict 2016-01-05 23:32:29 +01:00
stdenv stdenv-darwin: allow easier testing of bootstrap tools 2016-01-03 21:47:09 -05:00
test
tools youtube-dl: take advantage of the improved getVersion function 2016-01-05 20:09:39 +01:00
top-level Merge pull request #11945 from jgillich/fish 2016-01-06 01:25:37 +03:00