From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 26 Apr 2015 12:11:56 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/immediate-si-update'
X-Git-Tag: v0.5.5~40
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=1a8e3628040a94a8c06027335962a6cb2f827a63;hp=1a8e3628040a94a8c06027335962a6cb2f827a63;ds=sidebyside

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
---