Jaka Hudoklin f953d77be2 Revert "Reverts a bunch of commits as a try to fix GC errors." ... This reverts commit 1e4ba025c2. Conflicts: pkgs/development/web/nodejs/build-node-package.nix		2015-03-21 17:49:37 +01:00
..
applications	firefox: Update from 36.0.1 -> 36.0.3	2015-03-21 06:49:17 +01:00
build-support	Merge branch 'master' into staging	2015-03-17 13:35:05 +01:00
data	Update tempora-lgc source link as the original site seems to be permanently down	2015-03-21 19:11:09 +03:00
desktops	Patch gnome-control-center not to override VPN plugin paths.	2015-03-16 13:21:23 +01:00
development	Revert "Reverts a bunch of commits as a try to fix GC errors."	2015-03-21 17:49:37 +01:00
games	steam: fix: add gst lib (needed by audiosurf 2)	2015-03-21 02:54:32 +03:00
misc	vim-plugins: wakatime 3.0.7 -> 3.0.8	2015-03-10 04:58:45 +01:00
os-specific	grsecurity: Update test patch from 3.1-3.19.2-201503182219 -> 3.1-3.19.2-201503201903	2015-03-21 06:23:26 +01:00
servers	Set some meta.platforms	2015-03-20 20:04:42 +01:00
shells	Set some meta.platforms	2015-03-20 20:04:42 +01:00
stdenv
test
tools	gnupg: don't demand pcsclite on darwin	2015-03-21 09:14:36 -07:00
top-level	Merge pull request #6911 from kevinmarsh/django	2015-03-21 16:16:18 +01:00