diff options
| author | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2023-01-07 21:44:39 +0100 |
|---|---|---|
| committer | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2023-01-07 21:47:07 +0100 |
| commit | a5bba8b5c629ecbe786dd21cbe30b7b4e63f0700 (patch) | |
| tree | 6403b38e6f9cc87718deefdc28713d13e2ffa52e /ivi-input-modules/ivi-input-controller/src | |
| parent | 2c3d20a8afca05eddb85e72334a3bbafa7f81d31 (diff) | |
| parent | 010d53961b866891b9ec946053a3e3bfc0adbc2c (diff) | |
| download | wayland-ivi-extension-a5bba8b5c629ecbe786dd21cbe30b7b4e63f0700.tar.gz | |
Merge remote-tracking branch 'upstream/pull/110'
* upstream/pull/110
simple-weston-client: update dependencies to build on weston 7
ivi-id-agent: update dependencies to build on weston 7
ivi-id-agent: update to weston 7 header files
ivi-input-controller: update to weston 7 header files
Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com>
Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
solved merged onflicts:
ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
Diffstat (limited to 'ivi-input-modules/ivi-input-controller/src')
| -rw-r--r-- | ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c index 52fc6ab..826ee47 100644 --- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c +++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c @@ -31,7 +31,7 @@ #include <fcntl.h> #include <unistd.h> -#include "plugin-registry.h" +#include <libweston/plugin-registry.h> #include "ilm_types.h" #include "ivi-input-server-protocol.h" |