diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 02:15:38 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 02:15:38 +0000 |
| commit | db4bff0efce805cda1f5f7ebdfe04cff829996c4 (patch) | |
| tree | f230bf32bbb6b870288eaed2c1dce184d2915ec5 /chrome/test | |
| parent | 514ac9fdc5d4ac273df5d2c6f7ac1f6fd879c28c (diff) | |
| download | chromium_src-db4bff0efce805cda1f5f7ebdfe04cff829996c4.zip chromium_src-db4bff0efce805cda1f5f7ebdfe04cff829996c4.tar.gz chromium_src-db4bff0efce805cda1f5f7ebdfe04cff829996c4.tar.bz2 | |
Another merge conflict
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 8868526..adf72e7 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -287,7 +287,6 @@ input_files = ChromeFileList([ ]), MSVSFilter('test_infrastructure', [ 'chrome_test_suite.h', - '$CHROME_DIR/common/chrome_plugin_lib.cc', '$CHROME_DIR/common/ipc_test_sink.cc', '$CHROME_DIR/common/ipc_test_sink.h', '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', |