From 0a60f2bd84e9dd009e2faba1a6518300fb2c2a4e Mon Sep 17 00:00:00 2001 From: Robert Tidey Date: Mon, 24 Aug 2015 08:42:22 +0100 Subject: [PATCH] Add soft and hard error macro calls --- README.md | 2 +- bin/raspimjpeg | Bin 70337 -> 70405 bytes etc/raspimjpeg/raspimjpeg.1 | 2 ++ www/config.php | 2 +- www/macros/error_hard.sh | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 www/macros/error_hard.sh diff --git a/README.md b/README.md index 3b49ccbf..39aa577a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Web based interface for controlling the Raspberry Pi Camera, includes motion detection, time lapse, and image and video recording. -Current version 6.0.5 +Current version 6.0.6 All information on this project can be found here: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=63276 The wiki page can be found here: diff --git a/bin/raspimjpeg b/bin/raspimjpeg index 5905733b1809f80ae478128cac3866af00f28266..f015a19a66dce0bdd04413de02d1ff6f6ed3e264 100755 GIT binary patch delta 10246 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