]> git.tue.mpg.de Git - paraslash.git/commit
projects / paraslash.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c37ff19 f362374)
Merge branch 'refs/heads/t/immediate-si-update'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 26 Apr 2015 12:11:56 +0000 (14:11 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 26 Apr 2015 12:11:56 +0000 (14:11 +0200)
commit1a8e3628040a94a8c06027335962a6cb2f827a63
tree69ef5ee9d438bba5841ddb458b304e919d5cd675tree | snapshot
parentc37ff19d923966d04c6945e9d8bdd2c1fe08bf4fcommit | diff
parentf3623744f5b28e0df91323cf5069f1932df7848dcommit | diff
Merge branch 'refs/heads/t/immediate-si-update'

Cooking in next for four weeks.

* aft: Store resolved paths when adding files.
* aft: Update mtime and file size on afhi changes.
* aft: Update status items on afs events.
* aft.c: Pass struct ls_data pointer to make_status_items().
* afs: Simplify open_next_audio_file().

Conflicts:
aft.c
NEWS diff1 | diff2 | blob | history
afs.c diff1 | diff2 | blob | history
aft.c diff1 | diff2 | blob | history
command.c diff1 | diff2 | blob | history
server.h diff1 | diff2 | blob | history
paraslash - network audio streaming tools