diff options
| author | Sean Allred <code@seanallred.com> | 2014-11-08 18:05:54 -0500 |
|---|---|---|
| committer | Sean Allred <code@seanallred.com> | 2014-11-08 18:05:54 -0500 |
| commit | bd5e1b387b6f70ff756a2ceda229209c16a2eaf3 (patch) | |
| tree | e9a8e4453b470fd21b951b8d431ea5fad2d59196 /sx-time.el | |
| parent | 5fcd0dbd2c180b85898f42a7cd24a5835d6e3eda (diff) | |
| parent | 4207f8a4764ad3a0bca402160a24cca714cf0cde (diff) | |
Merge branch 'master' into initialization
Conflicts:
sx-request.el
Diffstat (limited to 'sx-time.el')
| -rw-r--r-- | sx-time.el | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 |