Pascal Wittmann e1d7f18cc5 instead: 2.2.5 -> 2.2.7		2015-10-26 14:45:14 +01:00
..
applications	Merge pull request #10613 from erikryb/master	2015-10-26 10:56:20 +01:00
build-support	Merge pull request #10517 from demin-dmitriy/sublime3	2015-10-24 19:16:34 +02:00
data	ubuntu_font_family: update from 0.80 to 0.83, potentially fixes CVE-2012-5356	2015-10-25 19:11:53 +01:00
desktops	kde: add glib include paths to NIX_CFLAGS_COMPILE	2015-10-25 20:03:09 +01:00
development	git-annex: update overrides	2015-10-26 13:15:16 +01:00
games	instead: 2.2.5 -> 2.2.7	2015-10-26 14:45:14 +01:00
misc	Merge pull request #10581 from matthiasbeyer/add-pipes	2015-10-25 04:23:56 +03:00
os-specific	syslinux: Disable parallel building	2015-10-26 09:23:28 +01:00
servers	nixpkgs: plex 0.9.12.11.1406 -> 0.9.12.13.1464	2015-10-25 06:32:19 -05:00
shells	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
stdenv	rebase on eelco's bootstrap-tools changes	2015-10-23 10:27:34 -07:00
test
tools	logstalgia: 1.0.6 -> 1.0.7	2015-10-26 14:45:13 +01:00
top-level	Add LTS Haskell package sets for 3.10 and 3.11.	2015-10-26 13:16:21 +01:00