aboutsummaryrefslogtreecommitdiffstats
path: root/options.html
diff options
context:
space:
mode:
authorPhil Crosby2010-01-18 00:53:21 -0800
committerPhil Crosby2010-01-18 00:53:21 -0800
commit86483bbfb426951c358cb50e768a81b7d6af84b2 (patch)
treec9d399cf9a069202a7a4ef41b1e1f77146fe5f47 /options.html
parent681f939c063a66cefa21b7eda63fa7256a7560de (diff)
parent4ac5eb502b3bae6eff714b0915ee1d9c3f143153 (diff)
downloadvimium-86483bbfb426951c358cb50e768a81b7d6af84b2.tar.bz2
Merge branch 'master' of github.com:philc/vimium
Conflicts: settings.html
Diffstat (limited to 'options.html')
0 files changed, 0 insertions, 0 deletions