Charles Strahan 7c1a3da1c4 macvim: fix bad copy/paste in 6f08fdd26 ... In 6f08fdd26, I left in a typo after copying from my `~/.nixpkgs/config`. I would normally test this out locally, but I'm fixing up my conf locally, and, in the interest of not forgetting to push this change up, made the edit through GitHub's UI. Oops.		2015-08-04 17:46:45 -05:00
..
applications	macvim: fix bad copy/paste in 6f08fdd26	2015-08-04 17:46:45 -05:00
build-support	grsecurity: Push testing from 4.0 -> 4.1	2015-08-04 13:28:16 -07:00
data	geolite-legacy: 2015-07-30 -> 2015-08-03	2015-08-03 14:33:55 +02:00
desktops	gnome-tweak-tool: Add patches to work nicely on NixOS	2015-08-03 10:14:14 +02:00
development	Merge pull request #9039 from Bevaz/ccache-links	2015-08-04 15:55:35 +03:00
games	minecraft-server: 1.8.1 -> 1.8.8	2015-07-31 21:20:19 +03:00
misc	hplip: 3.15.7 -> 3.15.6	2015-08-04 20:00:20 +02:00
os-specific	kernel: 3.14.48 -> 3.14.49	2015-08-04 13:30:08 -07:00
servers	riak2: use sensible default paths	2015-08-03 21:48:29 -04:00
shells	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
stdenv	make bootstrap files buildable in sandbox	2015-07-10 14:00:47 -07:00
test
tools	hevea: update from 2.23 to 2.25	2015-08-04 12:17:16 +02:00
top-level	Merge pull request #9098 from mayflower/composer-update	2015-08-04 16:34:47 +03:00