Merge branch 'master' into partial_frames

This commit is contained in:
Dhanya Maliakal 2015-09-10 13:08:01 +02:00
commit 4dba6d746d

View File

@ -92,7 +92,9 @@ public:
MEASUREMENTS_NUMBER,
FRAMES_FROM_START,
FRAMES_FROM_START_PG,
SAMPLES_JCTB
SAMPLES_JCTB,
SUBFRAME_ACQUISITION_TIME, /**< subframe exposure time */
MAX_TIMERS
};