Joachim F ca8fb930b1 Merge pull request #22356 from Ekleog/redsocks ... Redsocks		2017-02-09 22:39:43 +01:00
..
applications	vscode: 1.9.0 -> 1.9.1	2017-02-09 21:35:02 +01:00
build-support	grsecurity: overrideDerivation -> overrideAttrs	2017-02-09 16:23:06 +01:00
data	liberastika: init at 1.1.5 (#22420)	2017-02-04 16:38:01 +01:00
desktops	epiphany: 3.22.5 -> 3.22.6 for security issue	2017-02-09 12:18:04 +01:00
development	Merge pull request #22597 from knedlsepp/bump-armadillo	2017-02-09 21:33:37 +01:00
games	Merge branch 'staging'	2017-02-04 21:02:46 +01:00
misc	wine: 1.8.6 -> 2.0	2017-02-09 16:20:49 +01:00
os-specific	android-udev-rules: 20170202 -> 20170208	2017-02-09 22:23:52 +01:00
servers	Merge pull request #22576 from andrewthad/elasticsearch_2_classpath	2017-02-09 11:35:14 +01:00
shells	bash-completion: 2.4 -> 2.5	2017-02-06 21:59:10 +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 #22356 from Ekleog/redsocks	2017-02-09 22:39:43 +01:00
top-level	Merge pull request #22356 from Ekleog/redsocks	2017-02-09 22:39:43 +01:00