8000 merge revision(s) 44514: [Backport #9374] · github/ruby@42ffa2e · GitHub
[go: up one dir, main page]
Skip to content

Commit 42ffa2e

Browse files
nursenurse
committed
merge revision(s) 44514: [Backport ruby#9374]
 * ext/json/generator/depend: add build dependencies for json extension [Bug ruby#9374] [ruby-core:59609] * ext/json/parser/depend: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent bed9d6c commit 42ffa2e

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

‎ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Sat Feb 22 16:51:36 2014 Eric Wong <e@80x24.org>
2+
3+
* ext/json/generator/depend: add build dependencies for json extension
4+
[Bug #9374] [ruby-core:59609]
5+
* ext/json/parser/depend: ditto
6+
17
Sat Feb 22 16:34:12 2014 Yusuke Endoh <mame@tsg.ne.jp>
28

39
* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.

‎ext/json/generator/depend

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
$(OBJS): $(ruby_headers)
12
generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h

‎ext/json/parser/depend

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
$(OBJS): $(ruby_headers)
12
parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.1"
22
#define RUBY_RELEASE_DATE "2014-02-22"
3-
#define RUBY_PATCHLEVEL 67
3+
#define RUBY_PATCHLEVEL 68
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 2

0 commit comments

Comments
 (0)
0