Vladimír Čunát dfdf164f87 Merge master into x-updates ... Conflicts (trivial): pkgs/games/spring/default.nix		2014-02-10 19:15:58 +01:00
..
documentation	Adopt more packages.	2014-01-28 18:11:00 +01:00
fonts	andagii: fix fetch by providing a different user-agent	2014-02-08 11:16:22 +01:00
icons	hicolor_icon_theme: minor update 0.12 -> 0.13	2013-12-28 15:08:47 +01:00
misc	xorg xkeyboard-config: update, unify with the other expression	2014-01-30 13:46:02 +01:00
sgml+xml	pkgs/docbook-xsl: update to 1.78.1 (close #1069)	2014-01-26 11:20:11 +01:00