From fb73c5ab06ceb3b562bc5c613f457697be5c5b83 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 23 Mar 2017 19:00:57 +0100 Subject: [PATCH] acinclude.m4: fix merge error Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d0e7145f37bc3f942fba474787dceada6ea301c1 Author: vanhofen Date: 2017-03-23 (Thu, 23 Mar 2017) Origin message was: ------------------ - acinclude.m4: fix merge error ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/acinclude.m4 b/acinclude.m4 index 3a645d476..0f67ee152 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -376,6 +376,7 @@ if test "$BOXMODEL" = "hd1"; then AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee]) elif test "$BOXMODEL" = "hd2"; then AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) elif test "$BOXMODEL" = "raspi"; then AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi]) fi