Tobias Geerinckx-Rice d39f16fee6 pythonPackages.pelican: fix tests with Pygments 2.1 ... Broken in 38c83e2916. I'll open an upstream PR with this patch as well.		2016-01-24 19:43:54 +01:00
..
applications	Merge pull request #12568 from gebner/idea-openjdk8	2016-01-24 10:29:54 +01:00
build-support	grsecurity: fix kernel config and uncomment grsecurity kernels	2016-01-23 16:58:44 +00:00
data	numix-icon-theme-circle: 20151014 -> 20160121	2016-01-22 14:37:34 +01:00
desktops	Remove no longer (or never) referenced patches	2016-01-24 02:02:21 +01:00
development	pythonPackages.pelican: fix tests with Pygments 2.1	2016-01-24 19:43:54 +01:00
games	Remove no longer (or never) referenced patches	2016-01-24 02:02:21 +01:00
misc	Merge pull request #12529 from bendlas/update-wine	2016-01-23 06:43:06 +03:00
os-specific	batman-adv: 2015.2 -> 2016.0	2016-01-24 05:20:18 +01:00
servers	couchdb: add platform, remove maintainer that was added accidentally, fixes #12502	2016-01-24 14:39:47 +01:00
shells	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
stdenv	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
test
tools	homesick: init at 1.1.3 (close #12465)	2016-01-24 17:22:13 +01:00
top-level	pythonPackages.pelican: fix tests with Pygments 2.1	2016-01-24 19:43:54 +01:00