aboutsummaryrefslogtreecommitdiffstats
path: root/settings.html
diff options
context:
space:
mode:
authorPhil Crosby2009-11-11 00:28:09 -0800
committerPhil Crosby2009-11-11 00:28:09 -0800
commit300fa151c6f59955f9deb7ef2e195f11d79a95ec (patch)
tree8d599ba7ed0b585b7439c1b938c21736cb85f60f /settings.html
parentd367e58a555606b7ad232fa880484cad8a2f7844 (diff)
parent263ee35bcd468004718ee0457967c57991b0f09b (diff)
downloadvimium-300fa151c6f59955f9deb7ef2e195f11d79a95ec.tar.bz2
Merge branch 'master' of github.com:philc/vimium
Conflicts: vimiumFrontend.js
Diffstat (limited to 'settings.html')
0 files changed, 0 insertions, 0 deletions