DEV300: merge masterfix ea9085d6db4c@DEV300

27 files changed, 0 insertions, 2 deletions

diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index 59c2a6cdad6e..72aadb048832 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -1,5 +1,4 @@
 er	extras	:	solenv NULL
-er	extras									usr30073	-	none	NULL
 er	extras									usr1	-	all	er_mkout NULL
 er	extras\source\autotext					nmake	-	all	er_atxt NULL
 er	extras\source\autotext\lang				nmake	-	all	er_atxtl NULL
diff --git a/extras/source/templates/wizard/styles/lang/bg/sunstyle.ots b/extras/source/templates/wizard/styles/lang/bg/sunstyle.ots
deleted file mode 100644
index 0d294f92704e..000000000000
--- a/extras/source/templates/wizard/styles/lang/bg/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/cs/sunstyle.ots b/extras/source/templates/wizard/styles/lang/cs/sunstyle.ots
deleted file mode 100644
index feca2da3491c..000000000000
--- a/extras/source/templates/wizard/styles/lang/cs/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/da/sunstyle.ots b/extras/source/templates/wizard/styles/lang/da/sunstyle.ots
deleted file mode 100644
index a2599b837b79..000000000000
--- a/extras/source/templates/wizard/styles/lang/da/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/de/sunstyle.ots b/extras/source/templates/wizard/styles/lang/de/sunstyle.ots
deleted file mode 100644
index c3ca9cfba9d2..000000000000
--- a/extras/source/templates/wizard/styles/lang/de/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/delzip b/extras/source/templates/wizard/styles/lang/delzip
index 54bcf3046529..e69de29bb2d1 100644
--- a/extras/source/templates/wizard/styles/lang/delzip
+++ b/extras/source/templates/wizard/styles/lang/delzip
@@ -1 +0,0 @@
-~
diff --git a/extras/source/templates/wizard/styles/lang/en-GB/sunstyle.ots b/extras/source/templates/wizard/styles/lang/en-GB/sunstyle.ots
deleted file mode 100644
index dd080ca1b052..000000000000
--- a/extras/source/templates/wizard/styles/lang/en-GB/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/en-US/sunstyle.ots b/extras/source/templates/wizard/styles/lang/en-US/sunstyle.ots
deleted file mode 100644
index 7e570a57598e..000000000000
--- a/extras/source/templates/wizard/styles/lang/en-US/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/es/sunstyle.ots b/extras/source/templates/wizard/styles/lang/es/sunstyle.ots
deleted file mode 100644
index 317365254c8c..000000000000
--- a/extras/source/templates/wizard/styles/lang/es/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/eu/sunstyle.ots b/extras/source/templates/wizard/styles/lang/eu/sunstyle.ots
deleted file mode 100755
index 14fa85794ce4..000000000000
--- a/extras/source/templates/wizard/styles/lang/eu/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/fr/sunstyle.ots b/extras/source/templates/wizard/styles/lang/fr/sunstyle.ots
deleted file mode 100644
index 52f89b37e279..000000000000
--- a/extras/source/templates/wizard/styles/lang/fr/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/hu/sunstyle.ots b/extras/source/templates/wizard/styles/lang/hu/sunstyle.ots
deleted file mode 100644
index e7eba91ca8eb..000000000000
--- a/extras/source/templates/wizard/styles/lang/hu/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/it/sunstyle.ots b/extras/source/templates/wizard/styles/lang/it/sunstyle.ots
deleted file mode 100644
index 64ff6ad7e317..000000000000
--- a/extras/source/templates/wizard/styles/lang/it/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/ja/sunstyle.ots b/extras/source/templates/wizard/styles/lang/ja/sunstyle.ots
deleted file mode 100644
index 978f62397425..000000000000
--- a/extras/source/templates/wizard/styles/lang/ja/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/km/sunstyle.ots b/extras/source/templates/wizard/styles/lang/km/sunstyle.ots
deleted file mode 100644
index e7f07d4147c0..000000000000
--- a/extras/source/templates/wizard/styles/lang/km/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/ko/sunstyle.ots b/extras/source/templates/wizard/styles/lang/ko/sunstyle.ots
deleted file mode 100644
index 581228bc402e..000000000000
--- a/extras/source/templates/wizard/styles/lang/ko/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/nl/sunstyle.ots b/extras/source/templates/wizard/styles/lang/nl/sunstyle.ots
deleted file mode 100644
index 0fd540313d09..000000000000
--- a/extras/source/templates/wizard/styles/lang/nl/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/pl/sunstyle.ots b/extras/source/templates/wizard/styles/lang/pl/sunstyle.ots
deleted file mode 100644
index 4c2ac5793a15..000000000000
--- a/extras/source/templates/wizard/styles/lang/pl/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/pt-BR/sunstyle.ots b/extras/source/templates/wizard/styles/lang/pt-BR/sunstyle.ots
deleted file mode 100644
index ec10cca19653..000000000000
--- a/extras/source/templates/wizard/styles/lang/pt-BR/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/pt/sunstyle.ots b/extras/source/templates/wizard/styles/lang/pt/sunstyle.ots
deleted file mode 100644
index e24a5d14655e..000000000000
--- a/extras/source/templates/wizard/styles/lang/pt/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/ru/sunstyle.ots b/extras/source/templates/wizard/styles/lang/ru/sunstyle.ots
deleted file mode 100644
index 388e20768651..000000000000
--- a/extras/source/templates/wizard/styles/lang/ru/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/sk/sunstyle.ots b/extras/source/templates/wizard/styles/lang/sk/sunstyle.ots
deleted file mode 100644
index 84356bb9a6b8..000000000000
--- a/extras/source/templates/wizard/styles/lang/sk/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/sl/sunstyle.ots b/extras/source/templates/wizard/styles/lang/sl/sunstyle.ots
deleted file mode 100644
index 2cf8e69a8dd5..000000000000
--- a/extras/source/templates/wizard/styles/lang/sl/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/sv/sunstyle.ots b/extras/source/templates/wizard/styles/lang/sv/sunstyle.ots
deleted file mode 100644
index 9cbefcf73e98..000000000000
--- a/extras/source/templates/wizard/styles/lang/sv/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/vi/sunstyle.ots b/extras/source/templates/wizard/styles/lang/vi/sunstyle.ots
deleted file mode 100755
index 61607d5b239c..000000000000
--- a/extras/source/templates/wizard/styles/lang/vi/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/zh-CN/sunstyle.ots b/extras/source/templates/wizard/styles/lang/zh-CN/sunstyle.ots
deleted file mode 100644
index 4335b89340eb..000000000000
--- a/extras/source/templates/wizard/styles/lang/zh-CN/sunstyle.ots
+++ /dev/null
diff --git a/extras/source/templates/wizard/styles/lang/zh-TW/sunstyle.ots b/extras/source/templates/wizard/styles/lang/zh-TW/sunstyle.ots
deleted file mode 100644
index e95984e8c7be..000000000000
--- a/extras/source/templates/wizard/styles/lang/zh-TW/sunstyle.ots
+++ /dev/null