Vladimír Čunát 6345089ca0 Merge #29392: gnome3: 3.24 -> 3.26 ... It might be slightly confusing that a couple of the changes will be twice in the history, but let's merge this way.		2017-11-27 12:19:01 +01:00
..
applications	Merge #29392: gnome3: 3.24 -> 3.26	2017-11-27 12:19:01 +01:00
build-support	Merge branch 'ericson2314-cross-base' into staging	2017-11-27 03:33:47 -05:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 09:13:36 +01:00
desktops	Merge #29392: gnome3: 3.24 -> 3.26	2017-11-27 12:19:01 +01:00
development	Merge #29392: gnome3: 3.24 -> 3.26	2017-11-27 12:19:01 +01:00
games	PySolFC: init at 2.0	2017-11-25 09:43:42 +01:00
misc	treewide: Use targetPrefix instead of prefix for platform name prefixes	2017-11-27 03:15:50 -05:00
os-specific	treewide: Use targetPrefix instead of prefix for platform name prefixes	2017-11-27 03:15:50 -05:00
servers	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 11:38:13 +01:00
shells	nix-bash-completions: 0.4 -> 0.5	2017-11-21 14:05:03 +01:00
stdenv	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge #29392: gnome3: 3.24 -> 3.26	2017-11-27 12:19:01 +01:00
top-level	Merge #29392: gnome3: 3.24 -> 3.26	2017-11-27 12:19:01 +01:00