Thomas Tuegel c74cbb824b Merge pull request #14429 from samuelrivas/avoid-conflicts-in-emacs-withpackages ... Avoid conflicts in emacs withpackages		2016-04-04 07:39:35 -05:00
..
applications	Merge pull request #14432 from Profpatsch/sent-patches	2016-04-04 13:23:14 +02:00
build-support	emacsWithPackages: reduce some duplication	2016-04-03 21:21:50 +02:00
data	tzdata: 2016b -> 2016c	2016-03-31 02:53:31 +02:00
desktops	Merge pull request #14370 from jgillich/patch-5	2016-04-01 18:04:20 +02:00
development	libtorrentRasterbar: 1.0.6 -> 1.0.9	2016-04-04 00:37:24 +02:00
games	useOldCXXAbi: Change into a setup hook	2016-04-01 13:36:59 +02:00
misc	vimPlugins: add vim-jsonnet and zenburn	2016-03-31 23:20:44 -07:00
os-specific	linux_testing: 4.6-rc1 -> 4.6-rc2	2016-04-03 19:14:31 +00:00
servers	mini-httpd: add -ansi to CFLAGS	2016-04-03 00:46:23 +02:00
shells	Merge pull request #14343 from mayflower/upstream-zsh-zprofile	2016-04-01 14:44:38 +00:00
stdenv	useOldCXXAbi: Change into a setup hook	2016-04-01 13:36:59 +02:00
test	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
tools	svtplay-dl: 0.30.2016.02.08 -> 1.0	2016-04-03 16:39:30 +02:00
top-level	Merge pull request #14407 from ktosiek/gnaural-gcc	2016-04-04 12:05:49 +02:00