Merge branch 'master' into f19

2013-07-10 02:44:03 -07:00 · 2013-07-10 02:44:03 -07:00 · cf4c775e28
commit cf4c775e28
parent 68d0a55d23 346591f847
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@
 /libuv-v0.10.8.tar.gz
 /libuv-v0.10.9.tar.gz
 /libuv-v0.10.11.tar.gz
+/libuv-v0.10.12.tar.gz
--- a/libuv.spec
+++ b/libuv.spec
@ -4,7 +4,7 @@

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

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

 %changelog
+* Wed Jul 10 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.12-1
+- new upstream release 0.10.12
+
 * Wed Jun 19 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.11-1
 - new upstream release 0.10.11

--- a/2
+++ b/2
@ -1 +1 @@
-40c58c49563d29393faec5dd2a93ecbf  libuv-v0.10.11.tar.gz
+d8c39f12819e14dabe956b5a65383c59  libuv-v0.10.12.tar.gz