diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | b6fb876a55bf70003e42fd23786324b746b24aff (patch) | |
| tree | 578eed0a31b3e5ed0a4fa3b6c82d2accebdfa22b /soldep/inc | |
| parent | a21837c887d5268b4ec05c03c09af02a42fc0198 (diff) | |
| parent | 213c9f9662001c25bf37b8e35ec779a39b764d8e (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'soldep/inc')
| -rw-r--r-- | soldep/inc/soldep/prj.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx index 6ed271b27a87..7a75c5a1c310 100644 --- a/soldep/inc/soldep/prj.hxx +++ b/soldep/inc/soldep/prj.hxx @@ -380,7 +380,7 @@ private: ByteString aStarName; // no idee what this should be protected: - NAMESPACE_VOS( OMutex ) aMutex; + vos:: OMutex aMutex; USHORT nStarMode; SolarFileList aFileList; |