]> git.friedersdorff.com Git - max/dotfiles.git/commitdiff
projects / max / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25d868d 9bfd464)
Merge branch 'master' of git.friedersdorff.com:max/dotfiles
authorMaximilian Friedersdorff <max@friedersdorff.com>
Mon, 7 Nov 2016 09:03:31 +0000 (09:03 +0000)
committerMaximilian Friedersdorff <max@friedersdorff.com>
Mon, 7 Nov 2016 09:03:31 +0000 (09:03 +0000)
1  2 
emacs/.emacs patch | diff1 | diff2 | blob | history

diff --cc emacs/.emacs
Simple merge
Unnamed repository; edit this file 'description' to name the repository.