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

This commit is contained in:
Martin Lucina 2010-08-06 12:01:40 +02:00
commit b579aa9510

View File

@ -186,7 +186,7 @@
>
</File>
<File
RelativePath="..\..\..\src\downstream.cpp"
RelativePath="..\..\..\src\push.cpp"
>
</File>
<File
@ -326,7 +326,7 @@
>
</File>
<File
RelativePath="..\..\..\src\upstream.cpp"
RelativePath="..\..\..\src\pull.cpp"
>
</File>
<File
@ -408,7 +408,7 @@
>
</File>
<File
RelativePath="..\..\..\src\downstream.hpp"
RelativePath="..\..\..\src\push.hpp"
>
</File>
<File
@ -588,7 +588,7 @@
>
</File>
<File
RelativePath="..\..\..\src\upstream.hpp"
RelativePath="..\..\..\src\pull.hpp"
>
</File>
<File