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 /ranger.py | |
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 'ranger.py')
-rwxr-xr-x | ranger.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ranger.py b/ranger.py index d2e90ae7..49a3f36d 100755 --- a/ranger.py +++ b/ranger.py @@ -1,6 +1,6 @@ #!/usr/bin/python -O # ranger - a vim-inspired file manager for the console (coding: utf-8) -# 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. # ===================== |