aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorjez2011-05-14 20:34:29 -0400
committerjez2011-05-14 20:34:29 -0400
commitd6e059f2a3b8db7695de3851d48e62a6ca925af9 (patch)
tree57a01d033f78f8b323e4503d33bbddbd833cd973 /CREDITS
parent9fa550086afb0e3bb944721f0422f60ec50b69b7 (diff)
parent1cdbf5b3ceb6a35044eff1ffbfd54ac6e63bc84a (diff)
downloadvimium-d6e059f2a3b8db7695de3851d48e62a6ca925af9.tar.bz2
Merge branch 'bookmarks'
Conflicts: commands.js linkHints.js vimiumFrontend.js
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS1
1 files changed, 1 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 2b9a2ef6..eb8147d0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -21,6 +21,7 @@ Contributors:
tsigo
Werner Laurensse (github: ab3)
Svein-Erik Larsen <feinom@gmail.com> (github: feinom)
+ Bill Casarin <jb@jb55.com> (github: jb55)
R.T. Lechow <rtlechow@gmail.com> (github: rtlechow)
Justin Blake <justin@hentzia.com> (github: blaix)