aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorIlya Sukhar2010-09-23 23:38:53 -0700
committerIlya Sukhar2010-09-23 23:38:53 -0700
commit0370d60be82aead007f6b0804dd5b90e6fdb1b1c (patch)
tree7e27ab136de0b1f939ddfe041a0f011503286b12 /CREDITS
parent0d15a8fbdf78ab1a12783406bf678339882323a5 (diff)
parent64b550a4a7fa4af1d9c0996d6f66715dc479ccb5 (diff)
downloadvimium-0370d60be82aead007f6b0804dd5b90e6fdb1b1c.tar.bz2
Merge branch 'frames'
Conflicts: README.markdown background_page.html commands.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 8c986adc..0f1c5797 100644
--- a/CREDITS
+++ b/CREDITS
@@ -14,6 +14,7 @@ Contributors:
lack
markstos
rodimius
+ Tim Morgan <tim@timmorgan.org> (github: seven1m)
tsigo
Feel free to add real names in addition to GitHub usernames.