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
..
audio	Fix Hydrogen to build with JACK 1.9.9.5	2013-02-16 21:08:15 +01:00
display-managers/slim
editors	Get rid of the "sf" alias for "sourceforge"	2013-01-14 12:00:32 +01:00
graphics	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
networking	linphone: minor update and fix	2013-02-16 21:48:47 +01:00
office	Merge remote-tracking branch 'central/master' into x-updates	2013-02-18 13:49:11 +01:00
science	Merge remote-tracking branch 'central/master' into x-updates	2013-02-18 13:49:11 +01:00
taxes
version-management	Merge remote-tracking branch 'central/master' into x-updates	2013-02-18 13:49:11 +01:00
video	Updates: kdenlive-0.9.4 mlt-0.8.8	2013-02-14 20:06:54 +01:00
virtualization	virtualbox: Fix unpacking of extension pack.	2013-02-08 07:03:36 +01:00
window-managers	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-02-18 20:15:59 +01:00