Leo Famulari
d227260d2f
Merge branch 'master' into core-updates ...
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.
2016-07-22 18:58:31 -04:00
2016-07-22 18:58:31 -04:00
2016-06-27 09:30:01 +02:00
2016-07-03 23:58:29 +02:00
2016-07-20 16:54:31 +02:00
2015-05-31 22:39:48 +02:00
2015-01-09 01:01:04 +01:00
2014-10-05 21:58:42 +02:00
2016-05-04 23:35:55 +02:00
2016-07-20 22:53:02 +02:00
2015-06-24 18:05:03 +02:00
2016-05-28 01:07:12 +02:00
2016-07-12 22:47:08 +02:00
2016-07-20 16:39:19 +02:00
2016-07-20 17:02:35 +02:00
2015-03-30 15:21:11 +02:00
2015-11-22 14:35:28 +01:00
2015-01-26 21:58:12 +01:00
2016-07-12 22:47:08 +02:00
2016-07-12 22:47:08 +02:00
2016-06-08 19:07:58 +02:00
2014-09-24 19:08:03 +02:00
2016-05-25 23:33:56 +02:00
2016-05-24 00:06:01 +02:00
2015-01-26 21:58:12 +01:00
2016-07-12 22:47:08 +02:00
2016-03-16 11:27:37 +01:00
2016-03-31 01:40:30 -04:00
2016-01-13 17:43:21 +01:00
2015-09-04 18:31:06 +02:00
2016-05-06 13:25:30 +02:00
2016-07-12 22:47:08 +02:00
2015-03-18 14:43:03 +01:00
2014-04-04 00:23:17 +02:00
2016-07-12 22:47:08 +02:00
2016-07-14 19:07:07 +02:00
2015-10-12 10:59:31 +03:00
2015-10-29 17:30:18 -05:00
2016-06-12 23:55:22 +02:00
2015-01-11 23:50:01 +01:00
2016-07-16 14:41:39 +02:00
2016-07-12 22:47:08 +02:00
2016-03-05 00:19:10 +01:00
2016-06-09 23:34:56 +02:00
2016-05-17 14:02:48 +02:00
2016-06-27 09:30:01 +02:00
2016-07-19 00:07:12 +02:00
d227260d2f