summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2020-02-05 19:36:01 +0100
committerMax Kellermann <max@musicpd.org>2020-02-05 19:36:01 +0100
commit1e421cbcb2f26dfc6700fc49c1a6daed8454a84e (patch)
treec4fae91b54d53695937796520143d96eaa7a4a4d
parent196d5fde6530b81e63ce7a1ddb6166daa6482c5a (diff)
parent1923cf384493b4070f9746042c025787cf19e992 (diff)
parent1de5bd64d8b7172ba72877c63269c8d0fca5ceba (diff)
parent7d2c4ec775187ab8fc4f3edebf61ac5bd7a44587 (diff)
parenta3963de668447cf296db5d43421079ea9a3d7400 (diff)
parentb9db8ddee6273005ce8bb359c8d69a0e9063d53c (diff)
parenta4eed3e3302bde1fcb20a740455d400e7436ad80 (diff)
Merge remote-tracking branches 'neheb/patch-2', 'neheb/con', 'neheb/cons', 'neheb/guruhg', 'neheb/r12R3', 'neheb/fefgheh' and 'neheb/rhgerg3453'