Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-07-28 11:30:49 +02:00
..
admin	firefox: Build without xulrunner	2014-07-23 17:28:36 +02:00
archivers	zip: add meta.description	2014-06-23 13:35:08 +02:00
audio	mpdcron: add expression	2014-05-23 08:39:28 +10:00
backup	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
bluetooth	- Add openobex's unusual pkgconfig to pkgconfig path	2014-02-19 18:11:54 +00:00
cd-dvd	unetbootin: update 585 -> 603	2014-05-20 09:16:06 +02:00
compression	Merge pull request #1928 from 'cross-win-osx'.	2014-04-21 10:00:35 +02:00
filesystems	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
graphics	gnuplot: add optional Qt terminal	2014-07-23 18:01:31 -05:00
inputmethods/fcitx	fcitx: build im modules for gtk2, gtk3 and qt4	2014-05-11 14:01:53 +02:00
misc	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
networking	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
package-management	nixUnstable: Update to 1.8pre3705_71a20d4	2014-07-25 14:51:50 +02:00
security	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
system	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
text	enscript: Build with the default GCC	2014-07-23 11:25:38 +02:00
typesetting	Don't use ensureDir	2014-07-22 11:01:32 +02:00
video	Upgrade rtmpdump and get_iplayer	2014-05-07 20:56:37 +02:00
virtualization
X11	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00