Merge branch 'master' into core-updates

Browse source

Conflicts:
	etc/news.scm
	gnu/local.mk
	gnu/packages/check.scm
	gnu/packages/cross-base.scm
	gnu/packages/gimp.scm
	gnu/packages/java.scm
	gnu/packages/mail.scm
	gnu/packages/sdl.scm
	gnu/packages/texinfo.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm

...

This commit is contained in:

Marius Bakke 2020-04-08 13:00:50 +02:00

parent be1e842ad7 ba6f2bda18

commit 2778302399

No known key found for this signature in database

GPG key ID: A2A06DF2A33A54FA

172 changed files with 12138 additions and 1668 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

787

gnu/packages/emacs-xyz.scm

View file

File diff suppressed because it is too large Load diff