Domen Kožar bbc1df3092 Merge branch 'staging'		2015-05-25 11:33:05 +02:00
..
applications	Update syncthing to 0.11.6	2015-05-25 10:24:02 +02:00
build-support	Merge 'master' into staging	2015-05-24 20:39:58 +02:00
data	geolite-legacy -> 2015-05-20	2015-05-20 16:42:38 +02:00
desktops	goffice: update	2015-05-24 19:53:34 +02:00
development	Merge branch 'staging'	2015-05-25 11:33:05 +02:00
games	xbomb: add version 2.2b	2015-05-24 14:24:33 +00:00
misc	Refactor mkFlag / shouldUsePkg into the nixpkgs libraries	2015-05-22 13:26:55 -07:00
os-specific	linux-testing: 4.1-rc4	2015-05-24 15:40:58 -07:00
servers	Merge pull request #7978 from benley/prometheus	2015-05-25 01:52:49 +03:00
shells	fish: dont demand man-db on darwin since we cant build it	2015-05-23 13:48:54 -07:00
stdenv	Refactor mkFlag / shouldUsePkg into the nixpkgs libraries	2015-05-22 13:26:55 -07:00
test
tools	Merge branch 'staging'	2015-05-25 11:33:05 +02:00
top-level	catch: add version 1.1-3	2015-05-25 10:39:13 +02:00