Dario Bertini 1e40c2347a Fix conflict, Merge branch 'master' of github.com:NixOS/nixpkgs into redis-3.0.2		2015-06-22 12:20:02 +01:00
..
applications	hexchat: 2.9.6.1 -> 2.10.2	2015-06-22 12:28:28 +02:00
build-support	Add buildMaven	2015-06-21 22:24:03 -04:00
data	geolite-legacy -> 2015-06-15	2015-06-15 19:58:20 +02:00
desktops	remove duplicated gtk-vnc	2015-06-19 14:19:27 +02:00
development	Add myself as maintainer	2015-06-22 08:26:09 +02:00
games	Merge pull request #8449 from dezgeg/pr-bastet-platforms	2015-06-22 08:36:54 +02:00
misc	add pkg: vbam, closes #8339	2015-06-18 11:35:43 +02:00
os-specific	Add myself as maintainer	2015-06-22 08:26:09 +02:00
servers	Fix conflict, Merge branch 'master' of github.com:NixOS/nixpkgs into redis-3.0.2	2015-06-22 12:20:02 +01:00
shells	Add myself as maintainer	2015-06-22 08:26:09 +02:00
stdenv	Revert "curl: Modernize build"	2015-06-04 14:54:52 +02:00
test
tools	silver-searcher: 0.29.1 -> 0.30.0	2015-06-22 12:10:03 +02:00
top-level	Fix conflict, Merge branch 'master' of github.com:NixOS/nixpkgs into redis-3.0.2	2015-06-22 12:20:02 +01:00