Yury G. Kudryashov 2b619dd126 Merge with trunk (trivial svn merge URL/trunk) ... svn path=/nixpkgs/branches/stdenv-updates/; revision=28799		2011-08-24 21:15:58 +00:00
..
applications	Another merge miss	2011-08-24 20:22:23 +00:00
build-support	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
data
desktops	* Fix description.	2011-08-23 12:10:08 +00:00
development	Oops, wrong local merge	2011-08-24 20:32:46 +00:00
games	Restrict freeciv to linux platforms.	2011-08-21 15:36:25 +00:00
lib	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
misc	Updating the nongnu ghostscript	2011-08-24 15:44:54 +00:00
os-specific	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
servers	GNU MyServer 0.11.	2011-08-22 17:38:33 +00:00
shells	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
stdenv	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
test
tools	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
top-level	Merge with trunk (trivial svn merge URL/trunk)	2011-08-24 21:15:58 +00:00