Repository: incubator-freemarker
Updated Branches:
refs/heads/3 50f3bba88 -> 4c6e08a1c
closes apache/incubator-freemarker#28: Closing PR. Earler merge didn't close it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit:
http://git-wip-us.apache.org/repos/asf/inc
Repository: incubator-freemarker
Updated Branches:
refs/heads/3 bc35fa237 -> 50f3bba88
closes apache/freemarker-incubator#28: Closing PR. Earler merge didn't close it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit:
http://git-wip-us.apache.org/repos/asf/inc
Repository: incubator-freemarker
Updated Branches:
refs/heads/3 ce9ab30f2 -> bc35fa237
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ProcessingConfiguration.java
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/MutableParsingAndProcessingConfiguration.java
--
diff --git
a/freemarker-core/src/main/java/org/apa
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java
--
diff --git
a/freemarker-core-test/src/test/java/org/apa
Removed namingConvention setting, and made directive names, built-in names,
special variable names, and setting names, camel case. (Other naming
conventions, if needed, are planned to be handled with custom dialects.)
Along the way had fixed some String setting name keys to match the
setter/get
Merge remote-tracking branch 'origin/3' into 3
Conflicts:
FM3-CHANGE-LOG.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bc35fa23
Tree: http://git-wip-us.apache.org/repos/asf/incubat
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirSetting.java
--
diff --git
a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirS