Merge branch 'master' into f19

2013-09-06 15:16:46 -07:00 · 2013-09-06 15:16:46 -07:00 · b7b59ddba9
commit b7b59ddba9
parent ca657e0b3d c3f343f81a
3 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,3 +11,4 @@
 /libuv-v0.10.12.tar.gz
 /libuv-v0.10.13.tar.gz
 /libuv-v0.10.14.tar.gz
+/libuv-v0.10.15.tar.gz
--- a/libuv.spec
+++ b/libuv.spec
@ -4,7 +4,7 @@

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

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

 %changelog
+* Fri Sep 06 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.15-1
+- new upstream release 0.10.15
+  https://github.com/joyent/libuv/blob/v0.10.15/ChangeLog
+
 * Tue Aug 27 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.14-1
 - new upstream release 0.10.14
  https://github.com/joyent/libuv/blob/v0.10.14/ChangeLog
--- a/2
+++ b/2
@ -1 +1 @@
-86b90a5133085535d0588c340244e06e  libuv-v0.10.14.tar.gz
+7af2d61dad210204a7bbf3c93f813b88  libuv-v0.10.15.tar.gz