Merge branch 'master' into f19

2013-10-18 16:04:07 -07:00 · 2013-10-18 16:04:07 -07:00 · a0eb3964c4
parent 31d30bb5fd e7939ffcb2
commit a0eb3964c4
3 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,4 @@
 /libuv-v0.10.14.tar.gz
 /libuv-v0.10.15.tar.gz
 /libuv-v0.10.17.tar.gz
+/libuv-v0.10.18.tar.gz
--- a/libuv.spec
+++ b/libuv.spec
@ -4,7 +4,7 @@

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

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

 %changelog
+* Fri Oct 18 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.18-1
+- new upstream release 0.10.18
+  https://github.com/joyent/libuv/blob/v0.10.18/ChangeLog
+
 * Wed Sep 25 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.17-1
 - new upstream release 0.10.17
  https://github.com/joyent/libuv/blob/v0.10.17/ChangeLog
--- a/2
+++ b/2
@ -1 +1 @@
-16d50cfa46d3b8a9bc087c8b5453b788  libuv-v0.10.17.tar.gz
+1f93b79fc811d7ed58187670110841de  libuv-v0.10.18.tar.gz