Vladimír Čunát b5fba47147 Merge branch master into x-updates ... Conflicts (not used, deleted): pkgs/desktops/xfce/common.nix		2013-11-23 10:22:26 +01:00
..
audio	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
display-managers	slim: Work around broken PAM session handling	2013-10-15 13:23:40 +02:00
editors	emacs offlineimap mode added	2013-11-12 11:00:58 +01:00
graphics	imagemagick: minor update 6.8.7-5 -> .7-6	2013-11-17 15:41:10 +01:00
ike	add ike: IPSec client	2013-10-18 18:50:53 +02:00
misc	Updating Visual Understanding Environment	2013-11-22 10:35:10 +04:00
networking	teamviewer: pass script argument to underlying command	2013-11-21 16:24:31 +01:00
office	gnucash: Enable support for Finance::Quote	2013-11-16 17:29:55 +01:00
science	spyder: update 2.1.13.1 -> 2.2.5	2013-11-22 23:56:17 +01:00
search
taxes
version-management	git: Update to 1.8.4.3	2013-11-14 15:29:58 +01:00
video	vlc: minor update 2.1.0 -> .1	2013-11-14 22:57:26 +01:00
virtualization	Allow packages to be marked as "broken" by setting meta.broken	2013-11-04 21:11:00 +01:00
window-managers	Merge pull request #1245 from nathanielbaxter/dev/openbox	2013-11-21 00:34:19 -08:00