ikaruga/glife

forked from Kevin_Smarts/glife

Author	SHA1 Message	Date
morgolon	4cc4a42a21 fixed a strange bug in 152_sitr caused by a comment, most likely	9 years ago
morgolon	0a13c198c5 changed merge script to add newline to end of files if there is none	9 years ago
topsykrett	7a5c62e772 changed locationmerge so they retain orig. order	9 years ago
morgolon	8f183dc5d6 tested that transforming back and forth from qsp to utf-8 text files works (on my machine at least)	9 years ago