Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/design into release/10.0

5 years ago · 45a77ba4c3
2 changed files with 1864 additions and 1801 deletions
--- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java
+++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java
--- a/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex
+++ b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex
@ -578,7 +578,13 @@ FunctionNames = "ABS"|
                "YEAR"|
                "year"|
                "YEARDELTA"|
-                "yeardelta"
+                "yeardelta"|
                "SUMPRECISE"|
                "sumprecise"|
                "QUERY"|
                "query"|
                "WEBIMAGE"|
                "webimage"
 %state MLC