[Libreoffice-commits] .: 2 commits - sal/osl

[Lionel Dricot]

 sal/osl/unx/asm/interlck_x86.s |   52 ++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 0de63407f583ad1d5ad3dad9ac014f0c100a83b1
Merge: 4421155... 5583637...
Author: Lionel Dricot <ploum at ploum.net>
Date:   Thu Jun 7 12:38:33 2012 +0200

    Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/core

commit 4421155eea4a77420ada79d646ac69b7c6b73146
Author: Lionel Dricot <ploum at ploum.net>
Date:   Thu Jun 7 12:36:17 2012 +0200

    The correct comment for the assembly file is "#", not "*".
    This assembly file is only compiled on x86 Solaris.

diff --git a/sal/osl/unx/asm/interlck_x86.s b/sal/osl/unx/asm/interlck_x86.s
index c1f9900..f8acd48 100644
--- a/sal/osl/unx/asm/interlck_x86.s
+++ b/sal/osl/unx/asm/interlck_x86.s
@@ -1,29 +1,29 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/#########################################################################
+ #
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ # 
+ # Copyright 2000, 2010 Oracle and/or its affiliates.
+ #
+ # OpenOffice.org - a multi-platform office productivity suite
+ #
+ # This file is part of OpenOffice.org.
+ #
+ # OpenOffice.org is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License version 3
+ # only, as published by the Free Software Foundation.
+ #
+ # OpenOffice.org is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU Lesser General Public License version 3 for more details
+ # (a copy is included in the LICENSE file that accompanied this code).
+ #
+ # You should have received a copy of the GNU Lesser General Public License
+ # version 3 along with OpenOffice.org.  If not, see
+ # <http://www.openoffice.org/license.html>
+ # for a copy of the LGPLv3 License.
+ #
+ ########################################################################/
 
 
 .section   .text,"ax"