resolve merge conflict
[wakeup.git] / test /
drwxr-xr-x   ..
-rw-r--r-- 862 Makefile.am
-rwxr-xr-x 265 check_output
-rwxr-xr-x 342 colorsequence
-rw-r--r-- 3718 event_recurrance.cpp
-rw-r--r-- 646 event_recurrance.exp
-rw-r--r-- 695 event_run_sequence.cpp
-rw-r--r-- 616 flash.py
-rw-r--r-- 183 lightcontrol.conf
-rwxr-xr-x 1587 lightctrl
-rwxr-xr-x 311 lightctrl-fade
-rw-r--r-- 375 lightctrl-fade.exp
-rwxr-xr-x 938 lightctrl-oor
-rw-r--r-- 217 lightctrl-oor.exp
-rw-r--r-- 702 log_retime.cpp
-rw-r--r-- 1574 sunrise_test.cpp
-rw-r--r-- 343 sunrise_test.exp
-rw-r--r-- 910 sunset_alarms.xml
-rwxr-xr-x 635 sunset_summer
-rw-r--r-- 2878 sunset_summer.log.expect
-rwxr-xr-x 635 sunset_winter
-rw-r--r-- 2878 sunset_winter.log.expect
-rw-r--r-- 348 wakeup-01.xml
-rw-r--r-- 607 wakeup-02.xml
-rw-r--r-- 234 wakeup-03.xml
-rw-r--r-- 345 wakeup.conf
-rw-r--r-- 1120 wakeup_alarms.xml
-rw-r--r-- 180 wakeup_empty.xml
-rw-r--r-- 421 wakeup_load_events.cpp
-rw-r--r-- 955 wakeup_load_events.exp
-rwxr-xr-x 685 wakeup_spring
-rw-r--r-- 3185 wakeup_spring.log.expect
-rwxr-xr-x 677 wakeup_summer
-rw-r--r-- 3055 wakeup_summer.log.expect
-rwxr-xr-x 634 wakeup_winter
-rw-r--r-- 3705 wakeup_winter.log.expect
-rwxr-xr-x 361 wakeupsequence