diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-11-19 19:45:04 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 14:52:11 +0000 |
commit | f78a2bcce88dd5c12052ae3e55c561cdd48b05fe (patch) | |
tree | e56530808fd0e0ec6cfa1eb58339c8cd467854f0 /sal/qa/osl/socket/osl_Socket2.xsce | |
parent | e5111574fd904b38a3980ca4ea3d21cfcb22dea6 (diff) |
re-base on ALv2 code. Includes:
Patch contributed by Herbert Duerr:
#i118662# remove berkeleyDB from module xmlhelp (author=orwitt)
http://svn.apache.org/viewvc?view=revision&revision=1213188
#i119141# remove ISCII converter for now
http://svn.apache.org/viewvc?view=revision&revision=1306246
make exceptions for cppunittester verbose
http://svn.apache.org/viewvc?view=revision&revision=1174831
Patches contributed by Pedro Giffuni:
Avoid some uses of non portable #!/bin/bash in shell scripts.
http://svn.apache.org/viewvc?view=revision&revision=1235297
Patch contributed by Oliver-Rainer Wittmann
88652: applied patch, remove unicows deps
http://svn.apache.org/viewvc?view=revision&revision=1177585
drop OS/2 code, remove in-line assembler ARM atomics,
and obsolete armarch header.
Diffstat (limited to 'sal/qa/osl/socket/osl_Socket2.xsce')
-rw-r--r-- | sal/qa/osl/socket/osl_Socket2.xsce | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sal/qa/osl/socket/osl_Socket2.xsce b/sal/qa/osl/socket/osl_Socket2.xsce index 66e3bf1379ec..2f6d6d2504d5 100644 --- a/sal/qa/osl/socket/osl_Socket2.xsce +++ b/sal/qa/osl/socket/osl_Socket2.xsce @@ -1,2 +1,19 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# osl_Socket.ctors.ctors_family_Ipx osl_Socket.getLocalHost.getLocalHost_001 wntmsci |