Merge branch 'develop' into upgrade-libs

This commit is contained in:
Daniel Kochmański 2015-05-01 20:19:22 +02:00
commit f92fb005e0
2 changed files with 2 additions and 2 deletions

View file

@ -1890,7 +1890,7 @@ cl_symbols[] = {
{KEY_ "UCS-4LE", KEYWORD, NULL, -1, OBJNULL},
{EXT_ "LOAD-ENCODING", EXT_ORDINARY, NULL, -1, OBJNULL},
{EXT_ "MAKE-ENCODING", EXT_ORDINARY, NULL, -1, OBJNULL},
{EXT_ "MAKE-ENCODING", EXT_ORDINARY, si_make_encoding, 1, OBJNULL},
{EXT_ "ALL-ENCODINGS", EXT_ORDINARY, ECL_NAME(si_load_encoding), 1, OBJNULL},
{KEY_ "US-ASCII", KEYWORD, NULL, -1, OBJNULL},

View file

@ -1890,7 +1890,7 @@ cl_symbols[] = {
{KEY_ "UCS-4LE",NULL},
{EXT_ "LOAD-ENCODING",NULL},
{EXT_ "MAKE-ENCODING",NULL},
{EXT_ "MAKE-ENCODING","si_make_encoding"},
{EXT_ "ALL-ENCODINGS","ECL_NAME(si_load_encoding)"},
{KEY_ "US-ASCII",NULL},