Conflicts:
	README
	dictsource/dict_log
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/error_log
	phsource/vowel/vowelchart.png
	phsource/vowelcharts/af.png
	phsource/vowelcharts/am.png
	phsource/vowelcharts/bo.png
	phsource/vowelcharts/ca.png
	phsource/vowelcharts/cs.png
	phsource/vowelcharts/de.png
	phsource/vowelcharts/en-n.png
	phsource/vowelcharts/en-us.png
	phsource/vowelcharts/en-wm.png
	phsource/vowelcharts/en.png
	phsource/vowelcharts/es-la.png
	phsource/vowelcharts/es.png
	phsource/vowelcharts/et.png
	phsource/vowelcharts/fa.png
	phsource/vowelcharts/fr-ca.png
	phsource/vowelcharts/fr.png
	phsource/vowelcharts/hi.png
	phsource/vowelcharts/ht.png
	phsource/vowelcharts/hu.png
	phsource/vowelcharts/ka.png
	phsource/vowelcharts/kk.png
	phsource/vowelcharts/ml.png
	phsource/vowelcharts/mt.png
	phsource/vowelcharts/ne.png
	phsource/vowelcharts/nl.png
	phsource/vowelcharts/pt-pt.png
	phsource/vowelcharts/si.png
	phsource/vowelcharts/sk.png
	phsource/vowelcharts/sq.png
	phsource/vowelcharts/tn.png
	phsource/vowelcharts/tr.png
	platforms/big_endian/phondata-manifest