Vladimír Čunát 35a927149f Merge branch 'master' into x-updates ... Conflicts (both messed with mesa): pkgs/top-level/all-packages.nix		2013-02-02 21:11:00 +01:00
..
audio	bristol: fix JACK audio support	2013-01-05 17:00:38 +01:00
display-managers/slim	consolekit: Remove	2012-12-13 11:30:18 +01:00
editors	Get rid of the "sf" alias for "sourceforge"	2013-01-14 12:00:32 +01:00
graphics	xfig: update download location of the Debian patch files	2013-01-28 19:40:02 +01:00
misc	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
networking	vimprobable2: updating to 1.2.0	2013-01-23 00:04:47 +01:00
office	Rename openoffice directory to libreoffice	2013-01-29 12:43:53 +01:00
science	maxima: update to version 5.29.1	2013-01-19 02:31:21 +01:00
taxes
version-management	git: adding an option not to build the manual	2013-01-28 21:24:52 +01:00
video	Adding mplayer2, a mplayer fork.	2013-01-31 00:26:30 +01:00
virtualization	Merge pull request #239: VirtualBox guest update.	2013-01-10 03:29:44 +01:00
window-managers	haskell-xmonad-extras: update to version 0.11	2013-01-09 16:54:29 +01:00