aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorjez2011-02-13 09:58:39 +0800
committerjez2011-02-13 09:58:39 +0800
commit2b08bafb3be960f7d83741d4944e286e17397ca4 (patch)
tree1eb955e0c438bbc8f6bb82baa0e8c0121f5fcac9 /CREDITS
parentd3d7c0a65b3d376fb67755c576e95b1c92836cab (diff)
parent0bc004b21b91eac7b4690798ed22cafd871c97b0 (diff)
downloadvimium-2b08bafb3be960f7d83741d4944e286e17397ca4.tar.bz2
Merge branch 'master' into filter-hints
Conflicts: options.html
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS1
1 files changed, 1 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 2b88ed9e..cc55f0b8 100644
--- a/CREDITS
+++ b/CREDITS
@@ -10,6 +10,7 @@ Contributors:
Christian Stefanescu (github: stchris)
ConradIrwin
drizzd
+ hogelog
int3
Johannes Emerich (github: knuton)
Julian Naydichev <rublind@gmail.com> (github: naydichev)