diff options
| author | Simon Busch <morphis@gravedo.de> | 2012-08-27 12:28:21 +0200 |
|---|---|---|
| committer | Simon Busch <morphis@gravedo.de> | 2012-08-27 12:28:21 +0200 |
| commit | aae7f36e70d164eaf4917281f816891807c37d27 (patch) | |
| tree | 59350f68fb0f2c07e967ddcdb560216b5ec77e6a /include/Makefile.am | |
| parent | d851f2bceb5813ba128ab31384bbec7f8cc72f07 (diff) | |
| parent | a6b8e7d405b16b33a9726ddd70346b5dbb6c845a (diff) | |
| download | external_libsamsung-ipc-aae7f36e70d164eaf4917281f816891807c37d27.zip external_libsamsung-ipc-aae7f36e70d164eaf4917281f816891807c37d27.tar.gz external_libsamsung-ipc-aae7f36e70d164eaf4917281f816891807c37d27.tar.bz2 | |
Merge remote-tracking branch 'astarasikov/merge-24-aug'
Conflicts:
include/Makefile.am
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 1eb264d..09fecf8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -16,6 +16,7 @@ samsung_ipcinclude_HEADERS = \ gprs.h \ snd.h \ rfs.h \ + wakelock.h \ samsung-ipc.h \ $(NULL) |