Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=18472		2009-11-19 19:09:10 +00:00
..
applications	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
build-support	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
configs/etc
data	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
desktops	Fix gnome-doc-utils	2009-11-07 09:34:12 +00:00
development	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
games	Adding JAMP game..	2009-11-19 12:10:23 +00:00
lib	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
misc	- Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining	2009-11-19 19:03:34 +00:00
os-specific	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
servers	* Fix the GPM URL.	2009-11-18 12:47:58 +00:00
shells	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
stdenv	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
test
tools	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
top-level	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00