Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

..

CMakeLists.txt

Merge ../ZoneMinder.Steve into packetqueue

2016-08-31 11:58:22 -04:00

jinclude.h

Migrate svn to git

2013-03-17 00:45:21 +01:00

zm_bigfont.h

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_box.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_box.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_buffer.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_buffer.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_camera.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_camera.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_comms.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_comms.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_config.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_config.h.in

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_coord.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_coord.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_curl_camera.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_curl_camera.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_db.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_db.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_event.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_event.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_exception.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_exception.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_ffmpeg_camera.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_ffmpeg_camera.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_ffmpeg.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_ffmpeg.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_file_camera.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_file_camera.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_font.h

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_image_analyser.cpp

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_image_analyser.h

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_image.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_image.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_jpeg.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_jpeg.h

spelling fixes

2016-12-29 10:31:05 +01:00

zm_libvlc_camera.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_libvlc_camera.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_local_camera.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_local_camera.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_logger.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_logger.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_mem_utils.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_monitor.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_monitor.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_mpeg.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_mpeg.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_packetqueue.cpp

sorta works

2016-09-23 15:39:52 -04:00

zm_packetqueue.h

maybe fixes, maybe big memleaks

2016-09-20 16:59:43 -04:00

zm_poly.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_poly.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_regexp.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_regexp.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_remote_camera_http.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_remote_camera_http.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_remote_camera_rtsp.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_remote_camera_rtsp.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_remote_camera.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_remote_camera.h

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_rgb.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_ctrl.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_ctrl.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_data.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_data.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp_source.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_rtp_source.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtp.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtsp_auth.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtsp_auth.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtsp.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_rtsp.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_sdp.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_sdp.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_sendfile.h

tabs to spaces and use 2space indenting

2016-04-04 10:11:48 -04:00

zm_signal.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_signal.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_storage.cpp

work on fixing event view

2016-09-29 09:28:48 -04:00

zm_storage.h

change method from getPath to Path

2015-12-15 12:10:07 -05:00

zm_stream.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_stream.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_thread.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_thread.h

spelling fixes

2016-12-29 10:31:05 +01:00

zm_threaddata.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_time.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_time.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_timer.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_timer.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_user.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_user.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_utils.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_utils.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm_video.cpp

revert

2016-04-06 10:49:42 -04:00

zm_video.h

revert

2016-04-06 10:49:42 -04:00

zm_videostore.cpp

Merge branch 'fix_braces' into storageareas

2016-12-08 14:58:38 -05:00

zm_videostore.h

Instead of passing orientation, pass the whole monitor object so that we can use it's other features.

2016-12-06 11:54:34 -05:00

zm_zone.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zm_zone.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zm.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zma.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zmc.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zmf.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zmf.h

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zms.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zmstreamer.cpp

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zmu.cpp

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00