Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
build_winetricks.sh	add winetricks, modified by vcunat@gmail.com	2013-02-10 16:20:24 +01:00
default.nix	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02: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