diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-09-09 01:38:09 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-09 01:38:09 -0700 |
| commit | bb59a92bdb4f5b832a75ef9ff2c42aae58bdd7e9 (patch) | |
| tree | b4be9458914ea9e1272feba2b52505e38e9f0863 /src/Makefile.am | |
| parent | d5187ce694cca1c5bd05bd562d9494e7387a86d0 (diff) | |
| parent | 09dccb79f611110a5a653030c7c21958eda95a03 (diff) | |
| download | mpd-bb59a92bdb4f5b832a75ef9ff2c42aae58bdd7e9.tar.gz mpd-bb59a92bdb4f5b832a75ef9ff2c42aae58bdd7e9.tar.xz mpd-bb59a92bdb4f5b832a75ef9ff2c42aae58bdd7e9.zip | |
Merge branch 'mk/strset' into mk/playlist
* mk/strset:
use strset.h instead of tagTracker.h
strset: fix duplicate values
added string set library
Conflicts:
src/dbUtils.c
src/tagTracker.c
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d8640d304..0592d8e72 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -83,8 +83,8 @@ mpd_headers = \ tag.h \ tag_pool.h \ tag_id3.h \ - tagTracker.h \ utf8.h \ + strset.h \ utils.h \ volume.h \ ioops.h \ @@ -141,7 +141,7 @@ mpd_SOURCES = \ tag.c \ tag_pool.c \ tag_id3.c \ - tagTracker.c \ + strset.c \ utils.c \ volume.c \ utf8.c \ |