[Libreoffice-commits] .: 4 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit a57028fd4013a6a516b21a7b222900a8c89e824c
Merge: 3f43403... 6dc5d06...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Nov 12 14:37:31 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'
    
    Conflicts:
    	dictionaries/en/dictionaries.xcu

commit 6dc5d068fe8b36166c9fc1dd458d0a40144e68ef
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 11 13:25:05 2010 +0100

    Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)
commit c59c176c30cf554cd05d276827864dcf4a012b3c
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Tue Nov 2 20:37:12 2010 +0100

    Make sure Python builds for VS2008 again

diff --git a/python/makefile.mk b/python/makefile.mk
index 22cbe08..6f4b7ee 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -137,7 +137,7 @@ BUILD_DIR=PC/VC6
 # solver during registration in insetoo_native
 .IF "$(CCNUMVER)" >= "001600000000"
 BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0
-.ELIF
+.ELSE
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32"
 .ENDIF
 .ENDIF
commit 7370ad13751b0ca20c0930866e0c9e61ab947f51
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 4 12:27:55 2010 +0000

    Use base en_GB dicts for en-IE as well
    (cherry picked from commit fdca8b7bb980382a18c3f4f51c34e2ac9d6723b4)

diff --git a/dictionaries/en/dictionaries.xcu b/dictionaries/en/dictionaries.xcu
index 016a4d2..18c32e9 100644
--- a/dictionaries/en/dictionaries.xcu
+++ b/dictionaries/en/dictionaries.xcu
@@ -10,7 +10,7 @@
                 <value>DICT_SPELL</value>
             </prop>
             <prop oor:name="Locales" oor:type="oor:string-list">
-                <value>en-GB</value>
+                <value>en-GB en-IE</value>
             </prop>
         </node>
         <node oor:name="HunSpellDic_en-ZA" oor:op="fuse">
@@ -65,7 +65,7 @@
                 <value>DICT_HYPH</value>
             </prop>
             <prop oor:name="Locales" oor:type="oor:string-list">
-                <value>en-GB en-US en-ZA en-AU en-CA</value>
+                <value>en-GB en-US en-ZA en-AU en-CA en-IE</value>
             </prop>
         </node>
         <node oor:name="ThesDic_en-US" oor:op="fuse">
@@ -76,7 +76,7 @@
                 <value>DICT_THES</value>
             </prop>
             <prop oor:name="Locales" oor:type="oor:string-list">
-                <value>en-GB en-US en-ZA en-AU en-CA</value>
+                <value>en-GB en-US en-ZA en-AU en-CA en-IE</value>
             </prop>
         </node>
     </node>