diff options
| author | hut <hut@lavabit.com> | 2013-02-22 04:46:09 +0100 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2013-02-22 04:46:09 +0100 |
| commit | bf6a3d6d6c11a85c37322e713b3c7a6eb2a484fc (patch) | |
| tree | 776b05d2e7ed9ae03a3fb1115b8ae023e5bebbdd /Makefile | |
| parent | 4d48d33ca5529464dadbb2fc70888da4cd9d24fa (diff) | |
| parent | c1138eb006c6daaa9b88204b0695f18d55e027dc (diff) | |
| download | ranger-bf6a3d6d6c11a85c37322e713b3c7a6eb2a484fc.tar.gz | |
Merge branch 'master' into vcs
Conflicts: ranger/gui/widgets/browsercolumn.py
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile index 2a4975ce..dca20caa 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011 Roman Zimbelmann <romanz@lavabit.com> +# Copyright (C) 2009-2013 Roman Zimbelmann <hut@lavabit.com> # This software is distributed under the terms of the GNU GPL version 3. NAME = ranger |