Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-06-13 14:46:46 +01:00
20 changed files with 4463 additions and 3244 deletions
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.47.11c 31.May.13";
const char *version_string = "1.47.11d 11.Jun.13";
const int version_phdata = 0x014709;
int option_device_number = -1;