Merge from upstream to origin

2013-02-20 16:31:22 +09:00 · 2013-02-20 16:31:22 +09:00 · 2f21cad93b
parent 24767349b4
commit 2f21cad93b
2 changed files with 2 additions and 2 deletions
--- a/scripting/javascript/bindings/generated
+++ b/scripting/javascript/bindings/generated
@ -1 +1 @@
-Subproject commit 35c9124a808c8e67b5a9bef68d4ff4433dad8bd4
+Subproject commit 4731abe94375ad4b9bde20cfd8bd48d0e1538fb1
--- a/tools/cxx-generator
+++ b/tools/cxx-generator
@ -1 +1 @@
-Subproject commit b92f99a3e53c5d4c19eb166e649664bd7fd80bab
+Subproject commit 39286b435de49cfb745297bc514ed9f7d6d1f7f9