Merge branch 'master' of github.com:stevetts/tts_src

This commit is contained in:
Zach 2015-05-29 15:59:37 -05:00
commit 3a9ee31856

View file

@ -24,7 +24,7 @@ texture-anisotropic-degree 16
preferences-filename user/preferences.json preferences-filename user/preferences.json
# Content packs: # Content packs:
content-packs-filepath contentpacks/ content-packs-filepath user/contentpacks/
content-packs-sort-filename sort.yaml content-packs-sort-filename sort.yaml
# Backups: # Backups: