| Index: chrome/app/DEPS
|
| ===================================================================
|
| --- chrome/app/DEPS (revision 14820)
|
| +++ chrome/app/DEPS (working copy)
|
| @@ -4,5 +4,6 @@
|
| "+chrome/installer",
|
| "+chrome/personalization",
|
| "+sandbox",
|
| + "+skia/include/corecg",
|
| "+tools/memory_watcher",
|
| ]
|
|
|
| Property changes on: chrome\app\DEPS
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /trunk/src/chrome/app/DEPS:r13132,13255,13273,13285,13348,13453,13611,13636,13723,13916,13926,14234,14242,14891
|
| Merged /branches/chrome_webkit_merge_branch/chrome/app/DEPS:r69-2775
|
|
|
|
|