Pascal Wittmann 57469df20b Merge pull request #12439 from k0ral/conky ... conky: 1.10.0 -> 1.10.1		2016-01-17 11:54:34 +01:00
..
applications	R: add a new enableStrictBarrier package option.	2016-01-17 11:09:05 +01:00
build-support	requireFile: remove colon from the url for easier copy/paste	2016-01-16 21:58:40 +01:00
data	Merge pull request #12394 from rasendubi/terminess	2016-01-15 22:45:34 +03:00
desktops	cinnamon: remove dead packages	2016-01-14 23:55:47 +01:00
development	ffmpeg-2.2: remove this vulnerable branch	2016-01-17 11:45:10 +01:00
games	openttd: Add OpenGFX, OpenSFX, OpenMSX	2016-01-16 15:58:09 +01:00
misc	vimPlugins.youcompleteme: patch default python path	2016-01-16 20:21:47 +01:00
os-specific	conky: 1.10.0 -> 1.10.1	2016-01-17 11:22:10 +01:00
servers	Add rt and perl packages it needs	2016-01-15 12:05:43 -05:00
shells	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
stdenv	stdenv-darwin: add parent attribute to bootstrap	2016-01-16 14:54:11 -05:00
test
tools	fgallery: 1.7 -> 1.8	2016-01-17 11:28:50 +01:00
top-level	ffmpeg-2.2: remove this vulnerable branch	2016-01-17 11:45:10 +01:00