Merge branch 'v0.18.x'

This commit is contained in:
Max Kellermann 2014-08-12 16:54:32 +02:00
commit d026367334
2 changed files with 3 additions and 1 deletions

View File

@ -329,7 +329,7 @@ src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc
if HAVE_WINDOWS
noinst_DATA = src/win32/mpd_win32_rc.rc
src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
EXTRA_src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
endif

2
NEWS
View File

@ -57,6 +57,8 @@ ver 0.19 (not yet released)
* install systemd unit for socket activation
* Android port
ver 0.18.13 (not yet released)
ver 0.18.12 (2014/07/30)
* database
- proxy: fix build failure with libmpdclient 2.2