diff options
| author | Andreas Enge <andreas@enge.fr> | 2015-04-26 16:05:39 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2015-04-26 16:05:39 +0200 |
| commit | 003e8d5e04d4296a18a651bf2183335db87dca77 (patch) | |
| tree | f4ccbae91ef577f917d8e9441c66ef539d8f7f51 /gnu/packages/gnupg.scm | |
| parent | f62a8417baf2a887bdbee951479889c8062c1f3d (diff) | |
| parent | f8f63893be97be8afc55668faa6601a24bb41e2d (diff) | |
Merge branch 'wip-glib' into master.
Conflicts:
gnu/packages/package-management.scm
Diffstat (limited to 'gnu/packages/gnupg.scm')
0 files changed, 0 insertions, 0 deletions