diff options
author | Max Kellermann <max@duempel.org> | 2013-01-16 20:05:26 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-01-16 20:05:26 +0100 |
commit | 74500eaccac3fd906489a93e969b67440ae41f5c (patch) | |
tree | 05bad33463d15b534c9120ff9dc70381aed15558 /Makefile.am | |
parent | b7cf279d6da121d0bb0b274ab9581b697717b5a7 (diff) | |
parent | 1105e61f292fd61a6316a4b83439dbaa29c102fd (diff) | |
download | mpd-74500eaccac3fd906489a93e969b67440ae41f5c.tar.gz mpd-74500eaccac3fd906489a93e969b67440ae41f5c.tar.xz mpd-74500eaccac3fd906489a93e969b67440ae41f5c.zip |
Merge branch 'v0.17.x'
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 875ea4ccc..cf41e3ddd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1443,4 +1443,4 @@ endif EXTRA_DIST = $(doc_DATA) autogen.sh \ $(wildcard scripts/*.sh) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ - src/win/mpd_win32_rc.rc.in + src/win/mpd_win32_rc.rc.in src/win/mpd.ico |