diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /xml/relaxng/src/resources/update_html5_schema.sh | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'xml/relaxng/src/resources/update_html5_schema.sh')
| -rwxr-xr-x | xml/relaxng/src/resources/update_html5_schema.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xml/relaxng/src/resources/update_html5_schema.sh b/xml/relaxng/src/resources/update_html5_schema.sh index 299129868253..20d28e53762e 100755 --- a/xml/relaxng/src/resources/update_html5_schema.sh +++ b/xml/relaxng/src/resources/update_html5_schema.sh @@ -11,9 +11,9 @@ mkdir temp cd temp echo ">>>>> Preparing validator build" -hg clone https://bitbucket.org/validator/build build +git clone https://github.com/validator/build build cd build -hg import "$PATCHES/patch_build.patch" --no-commit +git apply "$PATCHES/patch_build.patch" cd .. echo |