diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:58:02 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:58:02 +0100 |
| commit | a3a19632f413a6fe8dee97f02d637e7197869b50 (patch) | |
| tree | b8a01b5b560e18bdb007ec5ff2fafd50a3c508a9 /cppu/prj | |
| parent | WaE: return after throw (diff) | |
| parent | Corrected assignment in makefile (diff) | |
| download | core-a3a19632f413a6fe8dee97f02d637e7197869b50.tar.gz core-a3a19632f413a6fe8dee97f02d637e7197869b50.zip | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
bridges/source/remote/urp/urp_environment.cxx
bridges/source/remote/urp/urp_propertyobject.cxx
bridges/source/remote/urp/urp_reader.cxx
remotebridges/source/factory/bridgefactory.cxx
stoc/source/corereflection/crefl.cxx
stoc/source/javavm/javavm.cxx
stoc/source/simpleregistry/simpleregistry.cxx
Diffstat (limited to 'cppu/prj')
| -rw-r--r-- | cppu/prj/build.lst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst index 0af8b3019621..8c6fa2fe54a4 100644 --- a/cppu/prj/build.lst +++ b/cppu/prj/build.lst @@ -11,4 +11,4 @@ cu cppu\source\AffineBridge nmake - all cu_AffineBridge cu_inc NULL cu cppu\source\LogBridge nmake - all cu_LogBridge cu_inc NULL cu cppu\util nmake - all cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL cu cppu\qa nmake - all cu_qa_cppunit cu_util NULL -cu cppu\qa\cppumaker nmake - all cu_qa_cppumaker cu_util NULL +#cu cppu\qa\cppumaker nmake - all cu_qa_cppumaker cu_util NULL |