nixpkgs

Go to file

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

doc

Merge pull request #1815 from vcunat/p/doc-package-naming

2014-03-04 23:41:35 +01:00

lib

Merge pull request #1837 from falsifian/apt-offline

2014-03-10 21:39:43 +01:00

maintainers/scripts

Fix updating of the tarball mirror

2014-02-19 13:58:42 +01:00

nixos

move windowManager.xbmc to desktopManager.xbmc