nixpkgs/pkgs/data
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
..
documentation manpages: update from 3.60 to 3.61 2014-03-01 05:13:49 +02:00
fonts Add Symbola font 2014-02-28 21:55:07 +04:00
icons hicolor_icon_theme: minor update 0.12 -> 0.13 2013-12-28 15:08:47 +01:00
misc tzdata: Provide lib as an additional output. 2014-03-12 10:00:44 +01:00
sgml+xml pkgs/docbook-xsl: update to 1.78.1 (close #1069) 2014-01-26 11:20:11 +01:00