Shea Levy 01df54f5cc Merge from trunk ... svn path=/nixpkgs/branches/stdenv-updates/; revision=29461		2011-09-23 16:58:45 +00:00
..
applications	Merge from trunk	2011-09-23 16:58:45 +00:00
build-support	Merge from trunk	2011-09-23 16:58:45 +00:00
data	Let poppler use ${POPPLER_DATADIR}	2011-09-19 08:35:30 +00:00
desktops	Re-enable ntrack support in KDE-4.7	2011-09-19 05:16:11 +00:00
development	Merge from trunk	2011-09-23 16:58:45 +00:00
games	scummvm more deps	2011-09-23 02:23:05 +00:00
lib	Merge from trunk	2011-09-23 16:58:45 +00:00
misc	pkgs/misc/cups/drivers/splix: added myself as a maintainer	2011-09-20 20:25:26 +00:00
os-specific	Merge from trunk	2011-09-23 16:58:45 +00:00
servers	* Zabbix updated to 1.8.7.	2011-09-09 09:39:43 +00:00
shells	Merge from trunk	2011-09-23 16:58:45 +00:00
stdenv	Making gcc 4.6 that of stdenv.	2011-09-01 14:28:13 +00:00
test
tools	Merge from trunk	2011-09-23 16:58:45 +00:00
top-level	Merge from trunk	2011-09-23 16:58:45 +00:00