William A. Kennington III f3d515e6dd Merge pull request #5091 from wkennington/master.boost ... This is close enough that any remaining incompatibilities can be sorted out.		2014-11-29 22:48:44 -08:00
..
applications	virtualbox: Update to upstream version 4.3.20.	2014-11-30 06:25:50 +01:00
build-support	nixos: Rename virtualbox to virtualboxGuest.	2014-11-27 18:42:22 +01:00
data	tzdata: Update to 2014j	2014-11-25 00:42:22 +01:00
desktops	e18: remove old desktop manager	2014-11-26 21:44:23 +01:00
development	Merge pull request #5176 from iu-parfunc/chaselev-deque	2014-11-30 03:17:51 +03:00
games	performous: new package	2014-11-25 21:39:46 +08:00
misc	my-env: Use sed to substitute $initialPath.	2014-11-25 14:14:43 +01:00
os-specific	Consolidate conf-compile steps for skarnet.org pkgs.	2014-11-28 13:10:37 -06:00
servers	Merge pull request #5088 from offlinehacker/nixos/kubernetes	2014-11-29 16:44:42 +01:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
stdenv	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
test
tools	Merge pull request #5181 from grwlf/plowshare	2014-11-29 21:57:05 +01:00
top-level	Merge pull request #5091 from wkennington/master.boost	2014-11-29 22:48:44 -08:00