diff options
author | Andrei Popescu <andreip@google.com> | 2010-04-21 18:16:19 +0100 |
---|---|---|
committer | Andrei Popescu <andreip@google.com> | 2010-04-21 18:16:19 +0100 |
commit | a0584f084721f17a0d034361a414cfb4e65736a6 (patch) | |
tree | e56e9a9870c0279ed2bb7c5a47fe19abf5987ea5 /CleanSpec.mk | |
parent | d901f89d79e9b9da8b603079bf549589e83ee8c2 (diff) | |
parent | 3c27e79b9a94ccd27938cffbf5abcef20f5716f5 (diff) | |
download | external_webkit-a0584f084721f17a0d034361a414cfb4e65736a6.zip external_webkit-a0584f084721f17a0d034361a414cfb4e65736a6.tar.gz external_webkit-a0584f084721f17a0d034361a414cfb4e65736a6.tar.bz2 |
resolved conflicts for merge of 3c27e79b to master
Diffstat (limited to 'CleanSpec.mk')
-rw-r--r-- | CleanSpec.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index b5601a1..cf1cd55 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -48,6 +48,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_int $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) # ************************************************ |