Commit b579aa95 authored by Martin Lucina's avatar Martin Lucina

Merge branch 'master' of github.com:zeromq/zeromq2

parents 6d35e82d 2100a913
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\downstream.cpp" RelativePath="..\..\..\src\push.cpp"
> >
</File> </File>
<File <File
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\upstream.cpp" RelativePath="..\..\..\src\pull.cpp"
> >
</File> </File>
<File <File
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\downstream.hpp" RelativePath="..\..\..\src\push.hpp"
> >
</File> </File>
<File <File
...@@ -588,7 +588,7 @@ ...@@ -588,7 +588,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\upstream.hpp" RelativePath="..\..\..\src\pull.hpp"
> >
</File> </File>
<File <File
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment