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
..
5.0.3.nix	More description fixes	2013-10-06 12:01:38 +02:00
5.1.nix	lua5: Add the lua-sockets extension.	2014-01-28 21:48:47 +01:00
5.2.nix	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00
sockets.nix	lua5: Add the lua-sockets extension.	2014-01-28 21:48:47 +01:00