diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-26 12:27:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-26 12:27:57 +0000 |
| commit | 51460c49a1762e18ae59a89fe3ea86f98495c17a (patch) | |
| tree | 5ebb3e6ce422426337d22edeb75ae1deb7d08097 /moz | |
| parent | a2f983cf72902c86f273c861a93e330bfe924627 (diff) | |
INTEGRATION: CWS merge20to201 (1.4.14); FILE MERGED
2005/09/23 10:01:09 hr 1.4.14.1: #i54997#: merge CWS pj33
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/mozilla-source-1.7.5.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch index 2c7edcafd184..55b0494941a8 100644 --- a/moz/mozilla-source-1.7.5.patch +++ b/moz/mozilla-source-1.7.5.patch @@ -7086,3 +7086,15 @@ # Force applications to be built non-statically # when building the mozcomps meta component +*** misc/mozilla/security/nss/lib/pki1/oiddata.h Thu Aug 25 21:30:00 2005 +--- misc/build/mozilla/security/nss/lib/pki1/oiddata.h Thu Aug 25 21:31:28 2005 +*************** +*** 39,44 **** +--- 39,45 ---- + static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$"; + #endif /* DEBUG */ + ++ #include "pki1t.h" + #ifndef NSSPKI1T_H + #include "nsspki1t.h" + #endif /* NSSPKI1T_H */ |