]> git.mjollnir.org Git - dotfiles/xdefaults.git/commit
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)
commit046f3edf7df5d8e4f109857bf9adb51f5e587131
tree58787ade33ed3a372c784e561c4cb28688d97968
parent67d7fdaf528af27d1d6ba6181d982650ea213215
parent7fa8b40d38ee25ccc0fbc46e09d6a15456b6f69d
Merge remote branch 'origin/master' into lysander

Conflicts:
.Xdefaults