nixpkgs/pkgs
Uli Baum b7ad8d667c Revert "poppler_data: 0.4.8 -> 0.4.9" (#39524)
This reverts commit 95d1d753dc.
See discussion in #39742
2018-05-09 00:20:26 +02:00
..
applications Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
build-support Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
common-updater
data Revert "poppler_data: 0.4.8 -> 0.4.9" (#39524) 2018-05-09 00:20:26 +02:00
desktops Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
development Revert "poppler_utils: 0.63.0 -> 0.64.0" (#39742) 2018-05-09 00:18:09 +02:00
games wesnoth: unite with wesnoth-dev 2018-05-08 16:06:30 +03:00
misc Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
os-specific Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
servers Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
shells Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
stdenv Merge pull request #40139 from obsidiansystems/modular-setup-hooks 2018-05-07 15:32:10 -04:00
test
tools Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
top-level unixtools: fixup bad merge 2018-05-08 15:37:10 -05:00