aszlig c7bac81c66 Merge 'mingw-w64' and 'darwin' into cross-win-osx. ... Both branches have quite a lot in common, so it's time for a merge and do the cleanups with respect to both implementations and also generalize both implementations as much as possible. This also closes #1876. Conflicts: pkgs/development/interpreters/lua-5/5.2.nix pkgs/development/libraries/SDL/default.nix pkgs/development/libraries/glew/default.nix pkgs/top-level/all-packages.nix		2014-03-12 10:16:51 +01:00
..
applications	liferea: fix https URIs by adding glib_networking	2014-03-11 22:01:12 +01:00
build-support	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00
data	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00
desktops	gnome3.libgnome_keyring with gobject introspection	2014-03-10 22:46:26 -03:00
development	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00
games	Update XBoard	2014-03-08 21:13:01 +04:00
misc	oxygen_gtk: update from 1.4.3 to 1.4.4	2014-03-09 16:54:24 +01:00
os-specific	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00
servers	opensmtpd: Update to 5.4.2p1	2014-03-06 11:31:29 +01:00
shells
stdenv	Move generation of coverage reports from nixos/lib/testing to releaseTools	2014-03-03 13:57:08 +01:00
test
tools	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00
top-level	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00