Carles Pagès d32a973fc9 Merge remote-tracking branch 'upstream/x-updates' into wayland ... Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/wayland/default.nix		2013-02-18 20:15:59 +01:00
..
applications	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-02-18 20:15:59 +01:00
build-support	Merge remote-tracking branch 'central/master' into x-updates	2013-02-18 13:49:11 +01:00
data	minor poppler-data update	2013-01-29 14:07:30 +01:00
desktops	Merge remote-tracking branch 'central/master' into x-updates	2013-02-18 13:49:11 +01:00
development	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-02-18 20:15:59 +01:00
games	urbanterror: Correction for previous commit.	2013-02-16 21:52:36 +04:00
lib	Merge remote-tracking branch 'central/master' into x-updates	2013-02-18 13:49:11 +01:00
misc	Merge remote-tracking branch 'central/master' into x-updates	2013-02-18 13:49:11 +01:00
os-specific	x86info: fix	2013-02-16 21:29:55 +01:00
servers	petidomo: update to version 4.3	2013-02-11 14:38:02 +01:00
shells	bash-completion: update to current git HEAD at 2.0-95-gd08b9f2	2013-01-30 12:25:11 +01:00
stdenv	lib.licenses.proprietary is definitely unfree	2013-01-27 18:36:54 -05:00
test
tools	gnuplot: configure GDFONTPATH using 'fontconfig'	2013-02-18 00:00:48 +01:00
top-level	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-02-18 20:15:59 +01:00