Undo basis/brand split: moved Python from basis to brand.

The Windows-only code in pyuno/zipcore/python.cxx may still need fixing.
2011-10-20 20:44:32 +02:00
parent cf33eb5fb4
commit fecde94354
8 changed files with 54 additions and 75 deletions
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -31,13 +31,13 @@
 #ifndef DISABLE_PYUNO
 File gid_File_Pymailmerge
    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
    Name = "mailmerge.py";
    Styles = (PACKED);
 End
 File gid_File_Pymailmerge_msgbox
    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
    Name = "msgbox.py";
    Styles = (PACKED);
 End