diff options
| author | Shawn O. Pearce <sop@google.com> | 2008-10-21 16:52:57 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2008-10-21 16:52:57 -0700 |
| commit | 8b2cdbed47386a920ed1d302006319330d31b270 (patch) | |
| tree | 0f8f0729c4fbf917e73c013a23b60034af37e199 | |
| parent | 1f0176ca89b044f2768883a5434847f5be30cf5d (diff) | |
| parent | 1c8a393dfe436f0f140d44f9706c9ed1dfea247c (diff) | |
| download | manifest-8b2cdbed47386a920ed1d302006319330d31b270.tar.gz | |
Merge branch 'master' into release-1.0
| -rw-r--r-- | default.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/default.xml b/default.xml index 8f2b33859..ce373d8c1 100644 --- a/default.xml +++ b/default.xml @@ -322,9 +322,11 @@ <project path="external/tremor" name="platform/external/tremor" /> <project path="external/webkit" name="platform/external/webkit"> - <remote name="wko" fetch="git://git.webkit.org/WebKit.git"> - <require commit="350652b509b092508f6c465c1596e43bbdec7466" /> - </remote> + <import> + <remap strip="WebKit-%version%/" /> + <mirror url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-%version%.tar.bz2" /> + <snapshot version="r30707" check="d8543bb6618c17b12da906afa77d216f58cf4058" /> + </import> </project> <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant"> |