Vladimír Čunát 4c5a71f777 Merge master into x-updates ... Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix		2013-12-18 23:21:29 +01:00
..
build_winetricks.sh	add winetricks, modified by vcunat@gmail.com	2013-02-10 16:20:24 +01:00
stable.nix	enable osmesa for wine (close #1228)	2013-12-10 16:36:23 +01:00
stable.upstream	Make 1.6 the default Wine version and call 1.7.4 wineUnstable	2013-10-21 21:27:18 +04:00
unstable.nix	Merge master into x-updates	2013-12-18 23:21:29 +01:00
unstable.upstream	Make 1.6 the default Wine version and call 1.7.4 wineUnstable	2013-10-21 21:27:18 +04:00
winetricks.nix	winetricks: Update to rev 1078	2013-12-09 00:34:35 +00:00
winetricks.patch	add winetricks, modified by vcunat@gmail.com	2013-02-10 16:20:24 +01:00