Frederik Rietdijk 8be25ffcc7 Merge pull request #41954 from jraygauthier/jrg/hplip_fixes_rebased ... hplip: 3.18.3 -> 3.18.5		2018-06-29 09:17:50 +02:00
..
applications	Merge pull request #42690 from r-ryantm/auto-update/marp	2018-06-29 09:12:00 +02:00
build-support	trivial-builders: disallow sub in requireFile	2018-06-26 21:49:08 -04:00
common-updater
data	Merge pull request #42388 from devx/update-font-awesome-5	2018-06-28 22:09:12 -04:00
desktops	Merge pull request #42457 from r-ryantm/auto-update/qtermwidget	2018-06-28 22:04:00 -04:00
development	Merge pull request #42372 from Assassinkin/sklearn-deap	2018-06-29 09:15:19 +02:00
games	treewide: http -> https sources (#42676)	2018-06-28 20:43:35 +02:00
misc	Merge pull request #41954 from jraygauthier/jrg/hplip_fixes_rebased	2018-06-29 09:17:50 +02:00
os-specific	Merge pull request #42337 from ookhoi/google-authenticator-failed-to-use-libqrencode	2018-06-28 22:12:09 -04:00
servers	Merge pull request #42717 from r-ryantm/auto-update/arangodb	2018-06-29 09:09:59 +02:00
shells	treewide: http -> https sources (#42676)	2018-06-28 20:43:35 +02:00
stdenv	make-bootstrap-tools-cross: remove broken i686-musl variant	2018-06-25 11:16:10 -05:00
test	Merge remote-tracking branch 'upstream/master' into staging	2018-06-18 15:30:39 -04:00
tools	Merge pull request #42703 from r-ryantm/auto-update/i2pd	2018-06-29 09:13:01 +02:00
top-level	Merge pull request #42372 from Assassinkin/sklearn-deap	2018-06-29 09:15:19 +02:00