diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-12 16:54:32 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-12 16:54:32 +0200 |
| commit | d026367334c4d5ca024d6127c5ddb91888b64b3d (patch) | |
| tree | 0fb95beb75d6248c45729162bc63bcbb425a442f | |
| parent | 7244dc45110118631c16448907c344163bcb402c (diff) | |
| parent | c3f111a56ceacd77574af021d23b481b74bc66d4 (diff) | |
| download | mpd-d026367334c4d5ca024d6127c5ddb91888b64b3d.tar.gz mpd-d026367334c4d5ca024d6127c5ddb91888b64b3d.tar.xz mpd-d026367334c4d5ca024d6127c5ddb91888b64b3d.zip | |
Merge branch 'v0.18.x'
Diffstat (limited to '')
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 295c98771..9123d479d 100644 --- 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 @@ -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 |