chiark / gitweb /
~mdw / disorder / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f624ba 55826f7)
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder master
authorMark Wooding <mdw@distorted.org.uk>
Sun, 15 Aug 2021 10:58:44 +0000 (11:58 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 15 Aug 2021 10:58:44 +0000 (11:58 +0100)
commitf2b44f108345bccc414643968de04115093ecf37
tree3330a5da633205dd809a40c0fbd6c7cf029456aatree | snapshot
parent5f624baebe43889bb2810720cb9cc6d0812f49cbcommit | diff
parent55826f7ba4afe59ebd1005ceb1194a8830fb1dd6commit | diff
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder:
  disobedience/control.c: Force internal event when buttons are frobbed.
  configure.ac: Use Automake `silent-rules' by default.
  doc/disorder_protocol.5.in: Document `sofar' field in track-info line.
Multi-user software jukebox -- https://www.greenend.org.uk/rjk/disorder/