Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ...

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

2014-08-04 16:51:47 +02:00

..

documentation

man-pages: Update to 3.64

2014-04-16 18:43:38 +02:00

fonts

source-han-sans: fixed package name

2014-07-30 16:27:20 +02:00

icons

hicolor_icon_theme: minor update 0.12 -> 0.13

2013-12-28 15:08:47 +01:00

misc

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00

sgml+xml

docbook5_xsl: update from 1.75.2 to 1.78.1

2014-04-09 12:41:10 +02:00