diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-08-26 00:53:34 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-08-26 00:53:34 +0200 |
| commit | 9d99d7dfb88f63d0cebef00ca426a834aad44048 (patch) | |
| tree | 7e8193a7fce5da62760c95305e7eda537d00a712 /core | |
| parent | d7d096df71c65cbcd35def83bdb4f7cc86c3f290 (diff) | |
| parent | 6da54b6e0e0b9daba92562fbf4434887dc1e3528 (diff) | |
| download | build-9d99d7dfb88f63d0cebef00ca426a834aad44048.zip build-9d99d7dfb88f63d0cebef00ca426a834aad44048.tar.gz build-9d99d7dfb88f63d0cebef00ca426a834aad44048.tar.bz2 | |
resolved conflicts for merge of 6da54b6e to master
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
Diffstat (limited to 'core')
| -rw-r--r-- | core/main.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index ef6c684..0c10c5e 100644 --- a/core/main.mk +++ b/core/main.mk @@ -404,6 +404,7 @@ subdirs := \ development/host \ development/tools/etc1tool \ development/tools/line_endings \ + development/tools/emulator/opengl \ external/clang \ external/easymock \ external/expat \ |