diff options
| author | Sean Allred <code@seanallred.com> | 2014-11-09 16:12:43 -0500 |
|---|---|---|
| committer | Sean Allred <code@seanallred.com> | 2014-11-09 16:12:43 -0500 |
| commit | 73943fe3ff5e55758df295343d8004fde79d1e62 (patch) | |
| tree | 89bee3942c01eb3e399c9c2a5231ffd26e9e4abf /sx-encoding.el | |
| parent | 0b8fd6291719c4913f64a9e322abcb025fbf5e40 (diff) | |
| parent | 5305686182f9e233d0c4d056eab9f28a40e3932c (diff) | |
Merge branch 'master' into network-list
Conflicts:
sx-site.el
Diffstat (limited to 'sx-encoding.el')
| -rw-r--r-- | sx-encoding.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sx-encoding.el b/sx-encoding.el index efb333e..8ac12ca 100644 --- a/sx-encoding.el +++ b/sx-encoding.el @@ -2,8 +2,7 @@ ;; Copyright (C) 2014 Sean Allred -;; Author: Sean Allred <sallred@calamity.tcs.com> -;; Keywords: help +;; Author: Sean Allred <code@seanallred.com> ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by |