Pascal Wittmann 04a128540d Merge pull request #22285 from nand0p/electricsheep ... electricsheep: 2.6.8 -> 2.7b33		2017-02-07 10:20:20 +01:00
..
applications	firefox-wrapper: remove gnash support, see #22342	2017-02-06 21:40:19 -05:00
build-support	Add a pkgs.dhallToNix utility	2017-01-26 20:11:49 -08:00
data	liberastika: init at 1.1.5 (#22420)	2017-02-04 16:38:01 +01:00
desktops	Merge pull request #22478 from peterhoeg/p/okteta	2017-02-06 11:19:13 -06:00
development	Revert "firefox-wrapper: remove gnash support, see #22342"	2017-02-06 21:39:09 -05:00
games	Merge branch 'staging'	2017-02-04 21:02:46 +01:00
misc	Merge pull request #22285 from nand0p/electricsheep	2017-02-07 10:20:20 +01:00
os-specific	jfbview: 0.5.2 -> 0.5.3, fixes build	2017-02-07 04:48:33 +01:00
servers	xf86-video-intel: 15c5ff1245 -> e4fe79cf0d.	2017-02-06 21:27:44 -05:00
shells	fish: 2.3.1 -> 2.5.0	2017-02-04 20:58:55 +01:00
stdenv	Merge pull request #22387 from Ericson2314/cross-3-platforms	2017-02-05 17:41:31 -05:00
test
tools	Merge pull request #22285 from nand0p/electricsheep	2017-02-07 10:20:20 +01:00
top-level	Merge pull request #22285 from nand0p/electricsheep	2017-02-07 10:20:20 +01:00