Merge branch 'master' into f19

2013-06-19 06:50:11 -07:00 · 2013-06-19 06:50:11 -07:00 · 68d0a55d23
commit 68d0a55d23
parent 1964cfd6ce 9c0c673bd0
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,3 +7,4 @@
 /libuv-v0.10.7.tar.gz
 /libuv-v0.10.8.tar.gz
 /libuv-v0.10.9.tar.gz
+/libuv-v0.10.11.tar.gz
--- a/libuv.spec
+++ b/libuv.spec
@ -4,7 +4,7 @@

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

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

 %changelog
+* Wed Jun 19 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.11-1
+- new upstream release 0.10.11
+
 * Fri May 31 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.9-1
 - new upstream release 0.10.9

--- a/2
+++ b/2
@ -1 +1 @@
-5c5ca5c332fc9daedc4c0db29657f2d3  libuv-v0.10.9.tar.gz
+40c58c49563d29393faec5dd2a93ecbf  libuv-v0.10.11.tar.gz