Vladimír Čunát 7943a3c648 fix bad merge		2013-02-02 21:22:11 +01:00
..
applications	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
build-support	Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy.	2013-01-30 14:53:04 +01:00
data	minor poppler-data update	2013-01-29 14:07:30 +01:00
desktops	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
development	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
games	simutrans: pass meta into the final package so it's built by hydra	2013-02-02 16:44:42 +01:00
lib	Add deepSeq lib function	2013-02-01 00:39:26 -05:00
misc	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
os-specific	powertop: fix and update	2013-02-02 11:07:14 +01:00
servers	Update zabbix2 to 2.0.4	2013-01-24 11:51:57 +01:00
shells	bash-completion: update to current git HEAD at 2.0-95-gd08b9f2	2013-01-30 12:25:11 +01:00
stdenv	lib.licenses.proprietary is definitely unfree	2013-01-27 18:36:54 -05:00
test
tools	Gummiboot: Fix build on 32-bit Linux	2013-02-02 11:03:01 -05:00
top-level	fix bad merge	2013-02-02 21:22:11 +01:00