summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2020-02-04 17:03:49 +0100
committerMax Kellermann <max@musicpd.org>2020-02-04 17:03:49 +0100
commit7bcccbedadf6d4a6d047573d304aa93de9ba95c8 (patch)
tree56350a78c9c1ec184f43af1f4d42782c4ad7195b /src
parent7c62887df706b4e6c9d43c32ee083fa0b2c8d250 (diff)
parentdfed9546aa784dddab8be04c676bb337c7c3d626 (diff)
parent452c41b71fe768227a3607f8742816134120c5f9 (diff)
parent7e41c4de58412e0a1b915f0598da66fe1e29988e (diff)
Merge remote-tracking branches 'neheb/bind', 'neheb/move' and 'neheb/str'