Shea Levy 47d277a7c0 Merge branch 'manual-kernel-config' ... Since the original merge won't be reverted, no need to keep things in a separate branch.		2012-07-29 14:45:43 -04:00
..
applications	Mercurial: Install hgweb.wsgi as well	2012-07-28 20:25:41 -04:00
build-support	buildEnv: don't warn about collisions in propagated packages	2012-07-25 23:18:39 -04:00
data	LMMath: add Latin Modern Math font	2012-07-19 09:07:57 +04:00
desktops	kde-workspace: Disable parallel building	2012-07-25 14:49:16 -04:00
development	go: updating to 1.0.2	2012-07-29 17:24:19 +02:00
games	kobodeluxe: fix compilation errors.	2012-07-12 23:42:20 +02:00
lib	Fix bug in uniqList.	2012-07-18 16:31:39 +02:00
misc	wine: Update to 1.5.9	2012-07-22 01:18:02 -04:00
os-specific	linux/kernel/manual-config: Only import from derivation when explicitly asked to	2012-07-29 13:26:39 -04:00
servers	dovecot2: Bump to 2.1.8	2012-07-24 18:34:19 -04:00
shells	tcsh: Bump	2012-07-27 19:27:25 -04:00
stdenv	* Sync with the trunk.	2012-05-02 13:19:07 +00:00
test
tools	btar: updating to 1.1	2012-07-29 14:12:52 +02:00
top-level	linux/kernel/manual-config: Do all of the config file parsing in the imported-from derivation	2012-07-29 13:24:05 -04:00