Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates ... Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix		2013-12-07 14:17:16 +01:00
..
applications	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
build-support
data	shared_mime_info: update from 1.1 to 1.2	2013-12-04 06:53:44 +02:00
desktops	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
development	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
games	Fixing ultrastardx linking with lua.	2013-12-07 12:24:34 +01:00
misc	slock: update from 1.0 to 1.1	2013-12-04 06:23:35 +02:00
os-specific	alsa: set meta.platform for ALSA-related packages to Linux	2013-12-06 19:26:34 +01:00
servers	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
shells
stdenv
test
tools	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
top-level	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00