Merge branch 'f19' into f20

2014-01-27 15:31:34 -07:00 · 2014-01-27 15:31:34 -07:00 · 5b72a39ee5
commit 5b72a39ee5
parent c5e2e9472b 25d126753c
3 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -24,3 +24,4 @@
 /node-v0.10.23-stripped.tar.gz
 /node-v0.10.24.tar.gz
 /node-v0.10.24-stripped.tar.gz
+/node-v0.10.25-stripped.tar.gz
--- a/nodejs.spec
+++ b/nodejs.spec
@ -1,5 +1,5 @@
 Name: nodejs
-Version: 0.10.24
+Version: 0.10.25
 Release: 1%{?dist}
 Summary: JavaScript runtime
 License: MIT and ASL 2.0 and ISC and BSD
@ -166,6 +166,10 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
 %{_pkgdocdir}/html

 %changelog
+* Mon Jan 27 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.25-1
+- new upstream release 0.10.25
+  http://blog.nodejs.org/2014/01/23/node-v0-10-25-stable/
+
 * Thu Dec 19 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.24-1
 - new upstream release 0.10.24
  http://blog.nodejs.org/2013/12/19/node-v0-10-24-stable/
--- a/2
+++ b/2
@ -1 +1 @@
-d2a6eeabc7aed4026fd66c7d0b66cdf5  node-v0.10.24-stripped.tar.gz
+0cb686d5644944b21d1ba0dd70e106d8  node-v0.10.25-stripped.tar.gz