Merge branch 'develop' into vtwopointoh

This commit is contained in:
alisdair sullivan 2013-12-17 02:03:21 +00:00
commit 3bb65e9bab
12 changed files with 104 additions and 45 deletions

View file

@ -1,13 +1,13 @@
-record(config, {
escaped_forward_slashes = false,
escaped_strings = false,
unescaped_jsonp = false,
dirty_strings = false,
strict_comments = false,
strict_utf8 = false,
strict_single_quotes = false,
strict_escapes = false,
stream = false,
error_handler = false,
incomplete_handler = false
}).
escaped_forward_slashes = false :: boolean(),
escaped_strings = false :: boolean(),
unescaped_jsonp = false :: boolean(),
dirty_strings = false :: boolean(),
strict_comments = false :: boolean(),
strict_utf8 = false :: boolean(),
strict_single_quotes = false :: boolean(),
strict_escapes = false :: boolean(),
stream = false :: boolean(),
error_handler = false :: false | jsx_config:handler(),
incomplete_handler = false :: false | jsx_config:handler()
}).