summaryrefslogtreecommitdiff
path: root/svx/source/dialog/charmap.src
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2001-08-29 19:49:50 +0000
committerOliver Bolte <obo@openoffice.org>2001-08-29 19:49:50 +0000
commitf863bbb40cf9c68626dde1bd0976fbc503f608e0 (patch)
tree1209053e71a5266ffb3b15017bb8ac9d7bb0a752 /svx/source/dialog/charmap.src
parentf30ffbbfcea8a5e09d908870554037997c8bef71 (diff)
Merge SRC638: 29.08.01 - 22:49:11
Diffstat (limited to 'svx/source/dialog/charmap.src')
-rw-r--r--svx/source/dialog/charmap.src9
1 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/dialog/charmap.src b/svx/source/dialog/charmap.src
index 733b45484596..875f132361e9 100644
--- a/svx/source/dialog/charmap.src
+++ b/svx/source/dialog/charmap.src
@@ -3,15 +3,15 @@
* $RCSfile: charmap.src,v $
*
<<<<<<< charmap.src
- * $Revision: 1.34 $
+ * $Revision: 1.35 $
=======
- * $Revision: 1.34 $
+ * $Revision: 1.35 $
>>>>>>> 1.30
*
<<<<<<< charmap.src
- * last change: $Author: vg $ $Date: 2001-08-27 20:14:52 $
+ * last change: $Author: obo $ $Date: 2001-08-29 20:49:50 $
=======
- * last change: $Author: vg $ $Date: 2001-08-27 20:14:52 $
+ * last change: $Author: obo $ $Date: 2001-08-29 20:49:50 $
>>>>>>> 1.30
*
* The Contents of this file are made available subject to the terms of
@@ -2714,3 +2714,4 @@ String RID_SUBSETSTR_MONGOLIAN
+