summaryrefslogtreecommitdiffstats
path: root/users/mechmerlin/mechmerlin.h
Commit message (Expand)AuthorAgeFilesLines
* Merlin's userspace updates (#8074)MechMerlin2020-02-031-1/+3
* Keymap: Update userspace (I want my Hacktoberfest shirt!) (#4252)MechMerlin2018-10-261-2/+2
* Keymap: Merlin Learns to QMK (#3820)MechMerlin2018-08-311-0/+17
[cgit] Unable to lock slot /tmp/cgit/3a300000.lock: No such file or directory (2)