]> git.mjollnir.org Git - dotfiles/xdefaults.git/commitdiff
projects / dotfiles / xdefaults.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67d7fda 7fa8b40)
Merge remote branch 'origin/master' into lysander lysander
authorPenny Leach <penny@mjollnir.org>
Wed, 3 Aug 2011 19:00:19 +0000 (21:00 +0200)
committerPenny Leach <penny@mjollnir.org>
Wed, 3 Aug 2011 19:00:19 +0000 (21:00 +0200)
Conflicts:
.Xdefaults


Trivial merge
Unnamed repository; edit this file to name it for gitweb.