Merge branch 'f19' into f20

2013-09-06 15:24:55 -07:00 · 2013-09-06 15:24:55 -07:00 · 7de7b5c172
commit 7de7b5c172
parent 2dfcabecae 793585cd7d
3 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,3 +16,4 @@
 /node-v0.10.14-stripped.tar.gz
 /node-v0.10.16-stripped.tar.gz
 /node-v0.10.17-stripped.tar.gz
+/node-v0.10.18-stripped.tar.gz
--- a/nodejs.spec
+++ b/nodejs.spec
@ -1,5 +1,5 @@
 Name: nodejs
-Version: 0.10.17
+Version: 0.10.18
 Release: 1%{?dist}
 Summary: JavaScript runtime
 License: MIT and ASL 2.0 and ISC and BSD
@ -172,6 +172,10 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
 %{_pkgdocdir}/html

 %changelog
+* Fri Sep 06 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.18-1
+- new upstream release 0.10.18
+  http://blog.nodejs.org/2013/09/04/node-v0-10-18-stable/
+
 * Tue Aug 27 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.17-1
 - new upstream release 0.10.17
  http://blog.nodejs.org/2013/08/21/node-v0-10-17-stable/
--- a/2
+++ b/2
@ -1 +1 @@
-8d8eea23c0ee4d40699d65cf8e80930a  node-v0.10.17-stripped.tar.gz
+71266043d872ee70218bd916a0e9c3a0  node-v0.10.18-stripped.tar.gz