summaryrefslogtreecommitdiff
path: root/builds/msvc/libzmq/libzmq.vcproj
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-09-01 15:29:19 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-09-01 15:29:19 +0200
commit0fe7d3c998f65fb93b0f3d15c40d8bc2fe0923ad (patch)
treeedcb770523d63d4acd7114adc5a92ecf0e52ab51 /builds/msvc/libzmq/libzmq.vcproj
parent651c1adc80ddc724877f2ebedf07d18e21e363f6 (diff)
parent6a0c323bb231a2460c238cd0b93293fcd482f9bc (diff)
conflicts resolved
Diffstat (limited to 'builds/msvc/libzmq/libzmq.vcproj')
-rw-r--r--builds/msvc/libzmq/libzmq.vcproj24
1 files changed, 8 insertions, 16 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj
index f38fb18..c7b256a 100644
--- a/builds/msvc/libzmq/libzmq.vcproj
+++ b/builds/msvc/libzmq/libzmq.vcproj
@@ -182,10 +182,18 @@
>
</File>
<File
+ RelativePath="..\..\..\src\decoder.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\devpoll.cpp"
>
</File>
<File
+ RelativePath="..\..\..\src\encoder.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\epoll.cpp"
>
</File>
@@ -358,14 +366,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\zmq_decoder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\src\zmq_encoder.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\zmq_engine.cpp"
>
</File>
@@ -640,14 +640,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\zmq_decoder.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\src\zmq_encoder.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\zmq_engine.hpp"
>
</File>