Changeset 18618
- Timestamp:
- 09/18/16 14:43:31 (8 years ago)
- Location:
- trunk/FACT++/drive
- Files:
-
- 1 added
- 30 copied
-
. (added)
-
Camera.cc (copied) (copied from trunk/Cosy/videodev/Camera.cc )
-
Camera.h (copied) (copied from trunk/Cosy/videodev/Camera.h )
-
FilterLed.cc (copied) (copied from trunk/Cosy/videodev/FilterLed.cc )
-
FilterLed.h (copied) (copied from trunk/Cosy/videodev/FilterLed.h )
-
Led.cc (copied) (copied from trunk/Cosy/caos/Led.cc )
-
Led.h (copied) (copied from trunk/Cosy/caos/Led.h )
-
MCaos.cc (copied) (copied from trunk/Cosy/main/MCaos.cc )
-
MCaos.h (copied) (copied from trunk/Cosy/main/MCaos.h )
-
MGImage.cc (copied) (copied from trunk/Cosy/gui/MGImage.cc )
-
MGImage.h (copied) (copied from trunk/Cosy/gui/MGImage.h )
-
MPointing.cc (copied) (copied from trunk/Mars/mpointing/MPointing.cc ) (1 prop)
-
MPointing.h (copied) (copied from trunk/Mars/mpointing/MPointing.h ) (1 prop)
-
MStarguider.cc (copied) (copied from trunk/Cosy/main/MStarguider.cc )
-
MStarguider.h (copied) (copied from trunk/Cosy/main/MStarguider.h )
-
MThread.cc (copied) (copied from trunk/Mars/mbase/MThread.cc ) (1 prop)
-
MThread.h (copied) (copied from trunk/Mars/mbase/MThread.h ) (1 prop)
-
MVideo.cc (copied) (copied from trunk/Cosy/videodev/MVideo.cc )
-
MVideo.h (copied) (copied from trunk/Cosy/videodev/MVideo.h )
-
PixClient.cc (copied) (copied from trunk/Cosy/videodev/PixClient.cc )
-
PixClient.h (copied) (copied from trunk/Cosy/videodev/PixClient.h )
-
Ring.cc (copied) (copied from trunk/Cosy/caos/Ring.cc )
-
Ring.h (copied) (copied from trunk/Cosy/caos/Ring.h )
-
TPointGui.cc (copied) (copied from trunk/Cosy/tpoint/TPointGui.cc )
-
TPointGui.h (copied) (copied from trunk/Cosy/tpoint/TPointGui.h )
-
TPointStar.cc (copied) (copied from trunk/Cosy/tpoint/TPointStar.cc )
-
TPointStar.h (copied) (copied from trunk/Cosy/tpoint/TPointStar.h )
-
Writer.cc (copied) (copied from trunk/Cosy/videodev/Writer.cc )
-
Writer.h (copied) (copied from trunk/Cosy/videodev/Writer.h )
-
telesto.cc (copied) (copied from trunk/Cosy/telesto.cc )
-
videodev.h (copied) (copied from trunk/Cosy/videodev/videodev.h )
-
trunk/FACT++/drive/MPointing.cc
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/removing_cpp11_features/mpointing/MPointing.cc merged eligible /branches/MarsFixTimeOffsetBranch/mpointing/MPointing.cc 18001-18008 /branches/MarsGapdTimeJitter/mpointing/MPointing.cc 18106-18332 /branches/MarsResidualTimeSpread/mpointing/MPointing.cc 18014-18037 /branches/MarsWobble/mpointing/MPointing.cc 18160-18279 /branches/Mars_MC/mpointing/MPointing.cc 17010-17164
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/FACT++/drive/MPointing.h
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/removing_cpp11_features/mpointing/MPointing.h merged eligible /branches/MarsFixTimeOffsetBranch/mpointing/MPointing.h 18001-18008 /branches/MarsGapdTimeJitter/mpointing/MPointing.h 18106-18332 /branches/MarsResidualTimeSpread/mpointing/MPointing.h 18014-18037 /branches/MarsWobble/mpointing/MPointing.h 18160-18279 /branches/Mars_MC/mpointing/MPointing.h 17010-17164
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/FACT++/drive/MThread.cc
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/removing_cpp11_features/mbase/MThread.cc merged eligible /branches/MarsFixTimeOffsetBranch/mbase/MThread.cc 18001-18008 /branches/MarsGapdTimeJitter/mbase/MThread.cc 18106-18332 /branches/MarsResidualTimeSpread/mbase/MThread.cc 18014-18037 /branches/MarsWobble/mbase/MThread.cc 18160-18279 /branches/Mars_MC/mbase/MThread.cc 17010-17164
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/FACT++/drive/MThread.h
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/removing_cpp11_features/mbase/MThread.h merged eligible /branches/MarsFixTimeOffsetBranch/mbase/MThread.h 18001-18008 /branches/MarsGapdTimeJitter/mbase/MThread.h 18106-18332 /branches/MarsResidualTimeSpread/mbase/MThread.h 18014-18037 /branches/MarsWobble/mbase/MThread.h 18160-18279 /branches/Mars_MC/mbase/MThread.h 17010-17164
-
Property svn:mergeinfo
set to (toggle deleted branches)
Note:
See TracChangeset
for help on using the changeset viewer.
