| Index: trunk/src/content/content.gyp
|
| ===================================================================
|
| --- trunk/src/content/content.gyp (revision 209769)
|
| +++ trunk/src/content/content.gyp (working copy)
|
| @@ -21,10 +21,14 @@
|
| }],
|
| ],
|
| },
|
| + 'includes': [
|
| + 'content_tests.gypi',
|
| + ],
|
| 'conditions': [
|
| ['OS != "ios"', {
|
| 'includes': [
|
| '../build/win_precompile.gypi',
|
| + 'content_shell.gypi',
|
| ],
|
| }],
|
| # In component mode, we build all of content as a single DLL.
|
|
|
| Property changes on: trunk\src\content\content.gyp
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|