Skip to content

Commit c4e1b92

Browse files
committed
Merge branch 'master-2.3' into dist/2.3/trusty
2 parents e11dbdc + 652ee99 commit c4e1b92

File tree

131 files changed

+3086
-1017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+3086
-1017
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ y.tab.c
123123
/enc/*.def
124124
/enc/*.exp
125125
/enc/*.lib
126+
/enc/jis/props.h
126127
/enc/unicode/data
127128

128129
# /enc/trans/

0 commit comments

Comments
 (0)