merges r29840 from trunk into ruby_1_9_2.

--
add dependency(insns.inc) to compile.obj

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 47a7a66b28..9557d25cf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 20 01:57:55 2010  Akio Tajima  <artonx@yahoo.co.jp>
+
+	* common.mk: add dependency(insns.inc) to compile.obj
+
 Thu Nov 18 00:02:17 2010  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/csv.rb: Upgrading output encoding with ASCII content 
diff --git a/common.mk b/common.mk
index 919c265b49..914c0f2b34 100644
--- a/common.mk
+++ b/common.mk
@@ -643,7 +643,7 @@ dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
 compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
   {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h \
-  {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc
+  {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc
 iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
   {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}debug.h
diff --git a/version.h b/version.h
index 9148cccb65..684bc97245 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 100
+#define RUBY_PATCHLEVEL 101
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1