Michael Raskin df867eddba Fixing wrong merge again - hopefully correctly this time ... svn path=/nixpkgs/trunk/; revision=15853		2009-06-04 12:24:08 +00:00
..
applications	Update WebKit and Midori	2009-06-04 11:20:26 +00:00
build-support	typo	2009-06-03 19:20:13 +00:00
configs/etc
data	Updating the xkeyboard_config patch for esperanto with alt_gr	2009-06-03 21:21:10 +00:00
desktops	Update WebKit and Midori	2009-06-04 11:20:26 +00:00
development	Updated libxklavier to version 3.9	2009-06-04 11:38:56 +00:00
games	big breaking change: renaming lib.getAttr to lib.attrByPath	2009-05-24 10:57:41 +00:00
lib	* nix-env gets confused when an attrset contains an attribute named	2009-05-29 09:47:55 +00:00
misc	Upgraded DOSBox to 0.73 and removed glibc fixes which are obsolete now	2009-05-29 12:14:56 +00:00
os-specific/linux	* KVM 86. This one finally seems to have decent CIFS performance	2009-06-02 15:59:42 +00:00
servers	gpsd: Fix client programs.	2009-06-01 00:03:08 +00:00
shells	* Another sync with the trunk.	2009-04-23 11:59:43 +00:00
stdenv	* Allow the user to install stdenv (nix-env -i stdenv) and get all the	2009-04-25 14:08:29 +00:00
test
tools	* ntp 4.2.4p7.	2009-06-02 19:35:26 +00:00
top-level	Fixing wrong merge again - hopefully correctly this time	2009-06-04 12:24:08 +00:00