Merged Upstreamv1.0.0

- Merge branch 'master' of github.com:apheleia/solarc-theme
- Merge branch 'master' of github.com:horst3180/arc-theme

13 files changed, 2 insertions, 2 deletions

diff --git a/extra/Chrome/arc-dark-theme/images/theme_frame.png b/extra/Chrome/solarc-dark-theme/images/theme_frame.png
index ef5e128..ef5e128 100644
--- a/extra/Chrome/arc-dark-theme/images/theme_frame.png
+++ b/extra/Chrome/solarc-dark-theme/images/theme_frame.png
diff --git a/extra/Chrome/arc-dark-theme/images/theme_tab_background.png b/extra/Chrome/solarc-dark-theme/images/theme_tab_background.png
index 597b912..597b912 100644
--- a/extra/Chrome/arc-dark-theme/images/theme_tab_background.png
+++ b/extra/Chrome/solarc-dark-theme/images/theme_tab_background.png
diff --git a/extra/Chrome/arc-dark-theme/images/theme_toolbar.png b/extra/Chrome/solarc-dark-theme/images/theme_toolbar.png
index 3432a67..3432a67 100644
--- a/extra/Chrome/arc-dark-theme/images/theme_toolbar.png
+++ b/extra/Chrome/solarc-dark-theme/images/theme_toolbar.png
diff --git a/extra/Chrome/arc-dark-theme/manifest.json b/extra/Chrome/solarc-dark-theme/manifest.json
index 6c0a14f..6c0a14f 100644
--- a/extra/Chrome/arc-dark-theme/manifest.json
+++ b/extra/Chrome/solarc-dark-theme/manifest.json
diff --git a/extra/Chrome/arc-darker-theme/images/theme_frame.png b/extra/Chrome/solarc-darker-theme/images/theme_frame.png
index 8368110..8368110 100644
--- a/extra/Chrome/arc-darker-theme/images/theme_frame.png
+++ b/extra/Chrome/solarc-darker-theme/images/theme_frame.png
diff --git a/extra/Chrome/arc-darker-theme/images/theme_toolbar.png b/extra/Chrome/solarc-darker-theme/images/theme_toolbar.png
index ff91e1c..ff91e1c 100644
--- a/extra/Chrome/arc-darker-theme/images/theme_toolbar.png
+++ b/extra/Chrome/solarc-darker-theme/images/theme_toolbar.png
diff --git a/extra/Chrome/arc-darker-theme/manifest.json b/extra/Chrome/solarc-darker-theme/manifest.json
index f9e5413..f9e5413 100644
--- a/extra/Chrome/arc-darker-theme/manifest.json
+++ b/extra/Chrome/solarc-darker-theme/manifest.json
diff --git a/extra/Chrome/arc-theme.crx b/extra/Chrome/solarc-theme.crx
index f3fc5b0..f3fc5b0 100644
--- a/extra/Chrome/arc-theme.crx
+++ b/extra/Chrome/solarc-theme.crx
diff --git a/extra/Chrome/arc-theme/images/theme_frame.png b/extra/Chrome/solarc-theme/images/theme_frame.png
index 48f841f..48f841f 100644
--- a/extra/Chrome/arc-theme/images/theme_frame.png
+++ b/extra/Chrome/solarc-theme/images/theme_frame.png
diff --git a/extra/Chrome/arc-theme/images/theme_toolbar.png b/extra/Chrome/solarc-theme/images/theme_toolbar.png
index ff91e1c..ff91e1c 100644
--- a/extra/Chrome/arc-theme/images/theme_toolbar.png
+++ b/extra/Chrome/solarc-theme/images/theme_toolbar.png
diff --git a/extra/Chrome/arc-theme/manifest.json b/extra/Chrome/solarc-theme/manifest.json
index fb8b6f4..fb8b6f4 100644
--- a/extra/Chrome/arc-theme/manifest.json
+++ b/extra/Chrome/solarc-theme/manifest.json
diff --git a/extra/Makefile.am b/extra/Makefile.am
index a21d248..0703ef7 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -1,2 +1,2 @@
 EXTRA_DIST = $(srcdir)/Chrome \
-	     $(srcdir)/Arc-Plank
+	     $(srcdir)/SolArc-Plank
diff --git a/extra/Arc-Plank/dock.theme b/extra/SolArc-Plank/dock.theme
index 4c77c81..2e0cc55 100644
--- a/extra/Arc-Plank/dock.theme
+++ b/extra/SolArc-Plank/dock.theme
@@ -1,4 +1,4 @@
-# Arc theme for Plank
+# SolArc theme for Plank
 # Author: Horst3180
 # Adapted from the default Plank theme