Merge 3p2-rock.

author Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>

Tue, 1 Feb 2011 05:07:38 +0000 (08:07 +0300)

committer Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>

Tue, 1 Feb 2011 05:07:38 +0000 (08:07 +0300)
author Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Tue, 1 Feb 2011 05:07:38 +0000 (08:07 +0300)
committer Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Tue, 1 Feb 2011 05:07:38 +0000 (08:07 +0300)
diff --cc src/fs/rock/RockSwapDir.cc
Simple merge
diff --cc src/ipc/Makefile.am

index 19f91118ed638ca4055653361e01d8db4f2ef707,522adc8d9e10af7c43c10866c96816020f02da99..cff479eb2951ba9faebcc37d348b715bfaf39d07
--- 1/src/ipc/Makefile.am
--- 2/src/ipc/Makefile.am
+++ b/src/ipc/Makefile.am
@@@ -17,10 -16,10 +17,12 @@@ libipc_la_SOURCES = 
         StrandCoord.cc \
         StrandCoord.h \
         StrandCoords.h \
+       StrandSearch.cc \
+       StrandSearch.h \
         SharedListen.cc \
         SharedListen.h \
+ +      SharedMemory.cc \
+ +      SharedMemory.h \
         TypedMsgHdr.cc \
         TypedMsgHdr.h \
         Coordinator.cc \
author	Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
	Tue, 1 Feb 2011 05:07:38 +0000 (08:07 +0300)
committer	Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
	Tue, 1 Feb 2011 05:07:38 +0000 (08:07 +0300)
		1	2
src/fs/rock/RockSwapDir.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/ipc/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history