diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-14 02:39:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-14 02:39:03 +0200 |
| commit | 5cc3338267214eb050e39bc509d8b4258cec6afd (patch) | |
| tree | e513393222f18a5d8d43fec116dac055e1a24d1a /src/main.c | |
| parent | 3047bdf6531d6718239d1e2e0f201d0b8e54dba1 (diff) | |
| parent | 1ae89728593fce4a40882fa133b9db269015da8f (diff) | |
| download | mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.tar.gz mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.tar.xz mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.zip | |
Merge branch 'v0.17.x'
Conflicts:
src/mapper.h
Diffstat (limited to '')
| -rw-r--r-- | src/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index b8823d7ef..a54ca9f3d 100644 --- a/src/main.c +++ b/src/main.c @@ -133,10 +133,8 @@ glue_mapper_init(GError **error_r) return false; } -#if GLIB_CHECK_VERSION(2,14,0) if (music_dir == NULL) music_dir = g_strdup(g_get_user_special_dir(G_USER_DIRECTORY_MUSIC)); -#endif mapper_init(music_dir, playlist_dir); |