diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-04-11 23:01:21 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-04-11 23:01:21 -0400 |
| commit | 6c0a5af3aba9902206a73a62e2be2e4dd67be9da (patch) | |
| tree | cbc0dbb938716a80cc0248b5aff97dc34f21c756 /.conkeror.mozdev.org | |
| parent | ebc4f813d517d44ddf7440fd8043c5d41adf8932 (diff) | |
| parent | a96ee608ce4be813ce381a6a0c195591f633986e (diff) | |
Merge branch 'hp-dv6426us-par' into identica-mode-1.2hp-dv6426us-par/identica-mode-1.2
Conflicts:
.emacs
Diffstat (limited to '.conkeror.mozdev.org')
| l--------- | .conkeror.mozdev.org | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.conkeror.mozdev.org b/.conkeror.mozdev.org new file mode 120000 index 0000000..49c36a2 --- /dev/null +++ b/.conkeror.mozdev.org @@ -0,0 +1 @@ +.mozilla/
\ No newline at end of file |