Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/misc/emulators/wine/default.nix		2013-06-10 10:04:46 +04:00
..
build_winetricks.sh	add winetricks, modified by vcunat@gmail.com	2013-02-10 16:20:24 +01:00
default.nix	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
default.upstream	Update Wine	2012-12-08 13:28:15 +04:00
winetricks.nix	Add sha256 hash to winetricks.	2013-03-30 20:00:05 +01:00
winetricks.patch	add winetricks, modified by vcunat@gmail.com	2013-02-10 16:20:24 +01:00