Merge branch 'development'

Conflicts:
	src/Makefile
This commit is contained in:
Reece H. Dunn
2014-02-02 13:52:55 +00:00
29 changed files with 2588 additions and 1243 deletions
+2 -1
View File
@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (C) 2005 to 2013 by Jonathan Duddington *
* Copyright (C) 2005 to 2014 by Jonathan Duddington *
* email: jonsd@users.sourceforge.net *
* Copyright (C) 2013 by Reece H. Dunn *
* *
@@ -125,6 +125,7 @@ static keywtab_t k_properties[] = {
{"isVFricative", 0, phVFRICATIVE},
{"isPalatal", 0, i_isPalatal},
{"isLong", 0, i_isLong},
{"isRhotic", 0, i_isRhotic},
{"isSibilant", 0, i_isSibilant},
{"isFlag1", 0, i_isFlag1},