summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2020-03-16 17:25:50 +0100
committerMax Kellermann <max@musicpd.org>2020-03-16 17:25:50 +0100
commit256cfc545ddf05ed72784922f3ec038da6747032 (patch)
tree4bada523bc612b0d07fda738ac1dd8bd6af6a5f5
parent77c6c3fabf78b521f5238579b18b324c94468e81 (diff)
parent7f10e7a6109bbbc38ba0e4c46c223fb35841efb6 (diff)
parente25a3d17e74e47f9d64e08c467dc53ab2874b7e6 (diff)
parent88d56c01e7e4eab064f0fa056c36588f11d970ae (diff)
parent97425d56e7ad0ce19357b5d8984de082c0dacffc (diff)
Merge remote-tracking branches 'neheb/fwhfggwe', 'neheb/nvm2', 'neheb/nvm22', 'neheb/bvm' and 'neheb/cl2'