Yury G. Kudryashov 8e7e316ae1 Oops, wrong local merge ... svn path=/nixpkgs/branches/stdenv-updates/; revision=28797		2011-08-24 20:32:46 +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	* Update xkeyboard-config to 2.1. (The latest version, 2.3, requires	2011-07-21 12:14:20 +00:00
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	Add a new way to handle option sets.	2008-08-05 17:16:35 +00:00
tools	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
top-level	Whoops, missed a commit, now merged through r28791	2011-08-24 19:33:42 +00:00