Nikolay Amiantov 39e9b43082 Merge branch 'gammu-smsd' of https://github.com/zohl/nixpkgs into zohl-gammu-smsd ... Closes #12998		2016-02-16 19:40:00 +03:00
..
applications	Merge branch 'gammu-smsd' of https://github.com/zohl/nixpkgs into zohl-gammu-smsd	2016-02-16 19:40:00 +03:00
build-support	nix-prefetch-git: use fetchgit's naming heuristic	2016-02-13 14:39:44 +00:00
data	wireless-regdb: 2015-12-14 -> 2016-02-08	2016-02-12 00:14:01 +01:00
desktops	Merge pull request #12683 from heydojo/bluetooth--plasma5	2016-02-12 13:49:54 +01:00
development	glibc: fix cve-2015-7547.patch so it applies cleanly	2016-02-16 17:23:35 +01:00
games	Merge pull request #12997 from ryantm/minecraft	2016-02-15 22:14:24 +03:00
misc	Merge pull request #12985 from colemickens/mxt-app	2016-02-16 00:26:18 +03:00
os-specific	Merge pull request #12979 from heydojo/alsa--1.1.0	2016-02-15 21:29:17 +01:00
servers	Merge pull request #12984 from colemickens/plexpass	2016-02-16 17:13:54 +03:00
shells	fish: don't use manpath(1) from PATH in functions/man.fish	2016-02-02 06:13:12 +01:00
stdenv	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
test
tools	Merge pull request #13031 from matthiasbeyer/update-packages	2016-02-16 19:02:58 +03:00
top-level	Merge pull request #13030 from desiderius/consul-0.6	2016-02-16 16:26:02 +01:00