]> git.mjollnir.org Git - dotfiles/awesome.git/commitdiff
projects / dotfiles / awesome.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec875f3 6bc53aa)
Merge remote branch 'origin/master' into lysander
authorPenny Leach <penny@mjollnir.org>
Thu, 14 Apr 2011 12:22:21 +0000 (14:22 +0200)
committerPenny Leach <penny@mjollnir.org>
Thu, 14 Apr 2011 12:22:21 +0000 (14:22 +0200)

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