diff options
| author | blundell <blundell@chromium.org> | 2015-01-20 00:45:44 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-20 08:47:29 +0000 |
| commit | 92ee6fb5ac1f20a4a45336253e11f1dbf862e347 (patch) | |
| tree | c2169fed4edf32100aa849f8063ccc82b0c29930 /.gitignore | |
| parent | 79b7fad5012d359381a0b57bdbf32b866de8ad4e (diff) | |
| download | chromium_src-92ee6fb5ac1f20a4a45336253e11f1dbf862e347.zip chromium_src-92ee6fb5ac1f20a4a45336253e11f1dbf862e347.tar.gz chromium_src-92ee6fb5ac1f20a4a45336253e11f1dbf862e347.tar.bz2 | |
Update mojo sdk to rev 53d4413e27ba6767cb6da33ab4342c419c725086
- Modify .gitignore to again ignore the prebuilt subdir
- Copy over minor changes in the network service impl from Mojo
TBR=jamesr
Review URL: https://codereview.chromium.org/858743003
Cr-Commit-Position: refs/heads/master@{#312171}
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -210,7 +210,6 @@ v8.log /mojo/mojo_wm_flow_embeddee_bindings.xml /mojo/mojo_wm_flow_embedder_bindings.xml /mojo/mojom_test.xml -/mojo/public/tools/prebuilt/ /mojo/sample_service.xml /native_client /net/Debug @@ -335,6 +334,7 @@ v8.log /third_party/mingw-w64 /third_party/mkl /third_party/mockito/src +/third_party/mojo/src/mojo/public/tools/prebuilt/ /third_party/nacl_sdk_binaries/ /third_party/nss /third_party/omaha/src/omaha |