diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-09-01 15:29:19 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-09-01 15:29:19 +0200 |
| commit | 0fe7d3c998f65fb93b0f3d15c40d8bc2fe0923ad (patch) | |
| tree | edcb770523d63d4acd7114adc5a92ecf0e52ab51 /builds/msvc/libzmq/libzmq.vcproj | |
| parent | 651c1adc80ddc724877f2ebedf07d18e21e363f6 (diff) | |
| parent | 6a0c323bb231a2460c238cd0b93293fcd482f9bc (diff) | |
conflicts resolved
Diffstat (limited to 'builds/msvc/libzmq/libzmq.vcproj')
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 24 |
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> |