Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-05-04 09:30:42 +01:00
7 changed files with 75 additions and 62 deletions
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.47.10b 03.May.13";
const char *version_string = "1.47.11 03.May.13";
const int version_phdata = 0x014709;
int option_device_number = -1;