Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=24429		2010-10-23 14:52:21 +00:00
..
default.nix	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
hal-evt.nix	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
info.nix	* HAL updated to 0.5.14.	2010-07-18 21:52:10 +00:00
synaptics.nix	Match capabilities instead of name	2010-04-13 06:49:34 +00:00