Tai Lee 4cfd1a874f Merge branch 'master' of github.com:sampsyo/beets into distance-refactor ... Conflicts: beets/autotag/match.py beets/config_default.yaml docs/changelog.rst docs/reference/config.rst		2013-06-06 23:28:25 +10:00
..
guides	changelog/thanks for ALAC (#295)	2013-06-01 17:33:06 -07:00
plugins	mpdupdate domain sockets (#313): changelog/docs	2013-06-05 18:43:47 -07:00
reference	preferred_media: null default, expand docs	2013-06-05 20:00:17 -07:00
changelog.rst	Merge branch 'master' of github.com:sampsyo/beets into distance-refactor	2013-06-06 23:28:25 +10:00
conf.py	1.1.1 -> 1.2.0	2013-06-05 15:21:43 -07:00
index.rst	link to GitHub Issues	2013-02-26 16:40:37 -08:00
Makefile	Sphinx documentation skeleton	2011-09-16 13:57:15 -07:00