summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--transcode.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35f66603d7..962f1e1234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 11 14:14:33 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * transcode.c: fix a typo
+ [ci skip][fix GH-1091] Patch by @jwworth
+
Wed Nov 11 11:58:38 2015 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (initialize): Connections are in passive mode per
diff --git a/transcode.c b/transcode.c
index d5add7b6e7..39b4b0bab2 100644
--- a/transcode.c
+++ b/transcode.c
@@ -154,7 +154,7 @@ struct rb_econv_t {
typedef struct {
const char *sname;
const char *dname;
- const char *lib; /* null means means no need to load a library */
+ const char *lib; /* null means no need to load a library */
const rb_transcoder *transcoder;
} transcoder_entry_t;