diff options
| author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-08-11 16:36:34 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-08-11 16:36:34 +0300 |
| commit | d8b3ffe6552ef72f6d6dd4ff35ef541c2c5d1393 (patch) | |
| tree | a57471d538b7629e095b7066c4ce019f57ee3ea6 /scripts/Makefile.am | |
| parent | 1a7daf45862ab3a8785b9f5e6d6950eff6637c63 (diff) | |
| parent | 4450e0a0e9f6ac7f63e6b30b94f456386e07011b (diff) | |
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Conflicts:
example/timer/odp_timer_test.c
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 27ec6ab..617eadc 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1 +1 @@ -EXTRA_DIST = git_hash.sh +EXTRA_DIST = git_hash.sh odp_version.sh |