mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 14:16:31 +00:00
Merge branch 'master' into dev
This commit is contained in:
commit
beebc4fa64
@ -1,4 +1,4 @@
|
|||||||
os_name="motionEyeOS"
|
os_name="motionEyeOS"
|
||||||
os_short_name="motioneyeos"
|
os_short_name="motioneyeos"
|
||||||
os_prefix="meye"
|
os_prefix="meye"
|
||||||
os_version="20170827"
|
os_version="20171003"
|
||||||
|
@ -538,7 +538,6 @@ def prereleases():
|
|||||||
'type': 'bool',
|
'type': 'bool',
|
||||||
'section': 'expertSettings',
|
'section': 'expertSettings',
|
||||||
'advanced': True,
|
'advanced': True,
|
||||||
'reboot': True,
|
|
||||||
'get': _get_os_settings,
|
'get': _get_os_settings,
|
||||||
'set': _set_os_settings,
|
'set': _set_os_settings,
|
||||||
'get_set_dict': True
|
'get_set_dict': True
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
MOTIONEYE_VERSION = 9d546ec1aa8da1fe27ad5c0ad212bdb2baf8dce1
|
MOTIONEYE_VERSION = 306155120776f36140794a1373df8b25ae639692
|
||||||
MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
|
MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
|
||||||
MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
|
MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
|
||||||
MOTIONEYE_LICENSE = GPLv3
|
MOTIONEYE_LICENSE = GPLv3
|
||||||
|
Loading…
x
Reference in New Issue
Block a user