Merge branch 'master' into f19

2014-02-19 20:46:53 -07:00 · 2014-02-19 20:46:53 -07:00 · 0fb9b6b2ec
commit 0fb9b6b2ec
parent 653dd2770e b851510f44
3 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -19,3 +19,4 @@
 /libuv.spec
 /libuv-v0.10.21.tar.gz
 /libuv-v0.10.23.tar.gz
+/libuv-v0.10.25.tar.gz
--- a/libuv.spec
+++ b/libuv.spec
@ -4,7 +4,7 @@

 Name: libuv
 Epoch:   1
-Version: 0.10.23
+Version: 0.10.25
 Release: 1%{?dist}
 Summary: Platform layer for node.js

@ -98,6 +98,10 @@ sed -e "s#@prefix@#%{_prefix}#g" \
 %{_includedir}/uv-private

 %changelog
+* Thu Feb 20 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.25-1
+- new upstream release 0.10.25
+  https://github.com/joyent/libuv/blob/v0.10.25/ChangeLog
+
 * Mon Jan 27 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.23-1
 - new upstream release 0.10.23
  https://github.com/joyent/libuv/blob/v0.10.23/ChangeLog
--- a/2
+++ b/2
@ -1 +1 @@
-b8dcbcc3ec58f44b7ea5bb46afece294  libuv-v0.10.23.tar.gz
+329a61fa3c30acf46efef1a9221b2054  libuv-v0.10.25.tar.gz