Jörg Thalheim 0b4770c002 Merge pull request #26309 from bachp/php-extension-dir ... php: set extension dir to correct location		2017-06-03 13:21:53 +01:00
..
applications	inspectrum: unstable-2017-02-18 -> unstable-2017-05-31 (#26284)	2017-06-03 12:30:40 +01:00
build-support	emacsWithPackages: support installing larger packages	2017-05-29 12:56:09 +01:00
common-updater	common-updater-script: fix error handling	2017-05-19 17:14:43 +03:00
data	geolite-legacy: 2016-07-08 -> 2017-05-26	2017-05-26 13:09:45 +02:00
desktops	webkitgtk: 2.14.11 -> 2.16.3	2017-05-26 16:20:54 +03:00
development	Merge pull request #26309 from bachp/php-extension-dir	2017-06-03 13:21:53 +01:00
games	Merge pull request #26330 from Drakonis/master	2017-06-02 21:46:23 +01:00
misc	user-local config.nix path fixed in docs	2017-05-27 13:38:15 +03:00
os-specific	bcc: 0.2.0 -> 0.3.0 (#26315)	2017-06-02 22:23:19 +01:00
servers	groonga: 7.0.0 -> 7.0.3	2017-06-02 21:23:33 -04:00
shells	zsh-syntax-highlighting: 0.4.1 -> 0.5.0	2017-05-23 12:18:05 +02:00
stdenv	Merge branch 'staging' (early part)	2017-05-30 16:08:21 +02:00
test
tools	Merge pull request #26311 from rnhmjoj/colorama	2017-06-03 13:08:24 +01:00
top-level	Merge pull request #26311 from rnhmjoj/colorama	2017-06-03 13:08:24 +01:00