Marius Bakke fb9a23a3f3 Merge branch 'master' into core-updates ... Conflicts: gnu/local.mk gnu/packages/python-xyz.scm gnu/packages/xml.scm guix/gexp.scm po/guix/POTFILES.in		2019-07-12 01:03:53 +02:00
..
images	Merge branch 'staging' into core-updates	2019-03-14 16:30:19 +01:00
build.scm	build: Add 'doc/build.scm' to build on-line copies of the manual.	2019-07-07 15:48:17 +02:00
contributing.texi	doc: Remove references to hydra.gnu.org.	2019-06-29 06:28:50 +02:00
environment-gdb.scm	doc: Add 'guix environment' examples.	2015-06-29 23:08:36 +02:00
fdl-1.3.texi	doc: Add the stub of a manual.	2012-10-13 16:05:01 +02:00
guix.texi	Merge branch 'master' into core-updates	2019-07-12 01:03:53 +02:00
htmlxref.cnf	doc: Update htmlxref.cnf.	2019-05-04 23:07:38 +02:00
local.mk	Merge branch 'staging' into core-updates	2019-05-25 00:25:15 +02:00
package-hello.scm	doc: Use the recommended Scheme format.	2015-09-14 23:10:58 +02:00