Vladimír Čunát 3ec2cea214 Merge master into x-updates ... Conflicts (auto-solved): pkgs/os-specific/linux/alsa-plugins/default.nix		2014-06-20 00:24:38 +02:00
..
applications	Merge master into x-updates	2014-06-20 00:24:38 +02:00
build-support	Add a function to overwrite just the version and sha256 by grepping them	2014-06-13 13:37:12 +04:00
data	aurulent-sans: new expression	2014-06-18 04:12:10 +04:00
desktops	xfce4-appfinder: update 4.9.4 -> 4.10.1	2014-06-17 09:02:38 +02:00
development	Merge master into x-updates	2014-06-20 00:24:38 +02:00
games	openxcom: update download link	2014-06-19 10:12:40 +02:00
misc	Merge recent master	2014-06-15 17:55:35 +02:00
os-specific	Merge master into x-updates	2014-06-20 00:24:38 +02:00
servers	Merge master into x-updates	2014-06-20 00:24:38 +02:00
shells	fish: Fixed tab completion with sudo (close #2705)	2014-06-10 11:36:12 +02:00
stdenv	Don't suggest using --arg config '{ allowUnfree = true; }'	2014-06-17 15:00:24 -05:00
test
tools	Add missing dependency to gtk-vnc	2014-06-19 18:23:14 +04:00
top-level	Merge master into x-updates	2014-06-20 00:24:38 +02:00