Conflicts:
	daemon/src/audio/sound/audiofile.cpp
	daemon/src/sfl_types.h

Conflicts:
	daemon/src/audio/alsa/alsalayer.cpp
	daemon/src/audio/audiolayer.cpp
	daemon/src/audio/pulseaudio/pulselayer.cpp

Conflicts:
	daemon/src/audio/audiolayer.cpp
	daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
	daemon/src/audio/codecs/alaw.cpp
	daemon/src/audio/codecs/audiocodec.cpp
	daemon/src/audio/codecs/audiocodec.h
	daemon/src/audio/codecs/ulaw.cpp

Normally it should be SFLphone/VERSION, unless the user
has changed it explicitly. Before it would start out as SFLphone,
then if the user forced it to sflphone, it would quietly change
to sflphone/VERSION.

Broken in commit 5b53f2f9

The increment operator here is pointless since we overwrite the
indices (by assignment) immediately after incrementing them.
Moreover, if this was ever changed to post increment the result would be undefined.