Kfir Itzhak 3cee6a133d Merge remote-tracking branch 'Sune1337/motion/FrameSkip' ...

Conflicts:
	db/zm_update-1.27.1.sql
	web/lang/nl_nl.php

2014-04-22 20:13:11 +03:00

..

alarm.php

Reverting my web changes in develop - keeping them in modern

2013-05-02 10:20:06 -04:00

control.php

more updates

2013-12-17 11:07:19 -05:00

event.php

more updates

2013-12-17 11:07:19 -05:00

log.php

more updates, currently the log updates are not enough. Filtering does not work.

2013-11-13 10:11:16 -05:00

Makefile.am

Reverting my web changes in develop - keeping them in modern

2013-05-02 10:20:06 -04:00

status.php

Merge remote-tracking branch 'Sune1337/motion/FrameSkip'

2014-04-22 20:13:11 +03:00

stream.php

Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely.

2013-09-12 13:54:03 -04:00

zone.php

more updates

2013-12-17 11:07:19 -05:00