Nikolay Amiantov a5cf243134 Merge branch 'staging' of ssh://github.com/NixOS/nixpkgs into staging		2016-04-25 18:03:35 +03:00
..
applications	Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging	2016-04-25 18:02:23 +03:00
build-support	Merge commit 'refs/pull/14907/head' of git://github.com/NixOS/nixpkgs into staging	2016-04-25 18:02:47 +03:00
data	geolite-legacy: 2016-04-19 -> 2016-04-25	2016-04-25 13:32:05 +02:00
desktops	Merge pull request #14916 from NicolasPetton/file-roller-nautilus-extension	2016-04-23 18:42:06 +02:00
development	Merge branch 'staging' of ssh://github.com/NixOS/nixpkgs into staging	2016-04-25 18:03:35 +03:00
games	Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging	2016-04-25 18:02:23 +03:00
misc	add get* helper functions and mass-replace manual outputs search with them	2016-04-25 13:24:39 +03:00
os-specific	Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging	2016-04-25 18:02:23 +03:00
servers	foswiki, egypt, wml: fix build	2016-04-25 16:22:52 +02:00
shells	fish: Reference correct output of glibc	2016-04-18 21:32:43 +03:00
stdenv	Merge commit 'refs/pull/14907/head' of git://github.com/NixOS/nixpkgs into staging	2016-04-25 18:02:47 +03:00
test
tools	Merge pull request #14963 from swistak35/pws	2016-04-25 12:48:59 +02:00
top-level	Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging	2016-04-25 18:02:10 +03:00