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
..
darwin	xcode: Update to new version 5.1.	2014-03-12 10:00:49 +01:00
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	wpa_supplicant: cosmetic to un-break syntax highlighting	2014-03-11 12:34:48 +01:00
windows	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00