diff options
author | Christopher Ferris <cferris@google.com> | 2015-04-15 15:58:00 -0700 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2015-04-15 15:58:00 -0700 |
commit | 5b5d97b42e84c2ac417271c3fab6fc282496a335 (patch) | |
tree | 9c72852322473822033addd4f1d902e4b33338d4 /.gitignore | |
parent | 3cae39166d1fc58873c5df3c0c96b45d49cb5778 (diff) | |
parent | b80fbcbbdb7ea6ba5918db7c665c836baa8c0b2e (diff) | |
download | jemalloc-5b5d97b42e84c2ac417271c3fab6fc282496a335.tar.gz |
Merge remote-tracking branch 'aosp/upstream-dev' into merge
Change-Id: If743a1d002b1793c08a66c0bbd5c2c3eedcebe64
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,7 +1,6 @@ /*.gcov.* -/autom4te.cache/ - +/bin/jemalloc-config /bin/jemalloc.sh /config.stamp @@ -15,6 +14,8 @@ /doc/jemalloc.html /doc/jemalloc.3 +/jemalloc.pc + /lib/ /Makefile |