Merge branch 'v0.18.x'

2014-08-12 16:54:32 +02:00 · 2014-08-12 16:54:32 +02:00 · d026367334
commit d026367334
parent 7244dc4511 c3f111a56c
2 changed files with 3 additions and 1 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -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

--- a/2
+++ b/2
@ -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