diff options
| author | ilya | 2010-06-29 21:26:19 -0700 |
|---|---|---|
| committer | ilya | 2010-06-29 21:26:19 -0700 |
| commit | 1170937361576c377530d436055fd2dd3b1f0f11 (patch) | |
| tree | 6b6608f81cbe5e4e0a976f47e84955bc95ae3d96 /CREDITS | |
| parent | 24ba4c55cb1cc70dddb1bcde7e8b2d8b20c97805 (diff) | |
| parent | 49f84f7495b78825f332a095517eeecec2b225b5 (diff) | |
| download | vimium-1170937361576c377530d436055fd2dd3b1f0f11.tar.bz2 | |
Merge branch 'branden'
Conflicts:
CREDITS
lib/keyboardUtils.js
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -6,6 +6,7 @@ Contributors: acrollet akhilman Bill Mill (github: llimllib) + Branden Rolston <brolston@gmail.com> (github: branden) ConradIrwin drizzd int3 |