Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 131 insertions, 0 deletions

diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-table.svg b/extensions/WikiEditor/modules/images/toolbar/insert-table.svg
new file mode 100644
index 00000000..3585edfc
--- /dev/null
+++ b/extensions/WikiEditor/modules/images/toolbar/insert-table.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg4674"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="insert-table.svg">
+  <defs
+     id="defs4676" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="14.917631"
+     inkscape:cy="9.7454912"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1041"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4679">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-754.71429,-709.93359)">
+    <g
+       id="g6398">
+      <rect
+         transform="matrix(0.99817187,0,0,1.0178786,1.3828921,-13.085829)"
+         y="712.74176"
+         x="756.2171"
+         height="15.99255"
+         width="19.028265"
+         id="rect4693"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:#8c8e89;stroke-width:1.00070357;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter6043)" />
+      <rect
+         y="713.93359"
+         x="757.71429"
+         height="2"
+         width="16"
+         id="rect6055"
+         style="fill:#a0bdd9;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <rect
+         y="716.93091"
+         x="757.71429"
+         height="10.047351"
+         width="3"
+         id="rect6057"
+         style="fill:#cfd0c8;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <rect
+         y="715.93835"
+         x="761.70416"
+         height="11.039861"
+         width="11.985021"
+         id="rect6059"
+         style="fill:#f0f2eb;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path6061"
+         d="m 761.21785,726.44068 0,-12.01418"
+         style="opacity:0.24842769;fill:none;stroke:#000000;stroke-width:0.99643618;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path6061-6"
+         d="m 765.9481,726.93359 0,-13.125"
+         style="opacity:0.24842769;fill:none;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path6061-65"
+         d="m 765.48228,726.43359 0,-12.01418"
+         style="opacity:0.24842769;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path6061-5"
+         d="m 770.34364,726.43359 0,-12.01418"
+         style="opacity:0.24842769;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path6061-68"
+         d="m 773.20619,719.33746 -14.9838,0"
+         style="opacity:0.24842769;fill:none;stroke:#000000;stroke-width:1.00806725;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path6061-68-8"
+         d="m 773.21327,716.43359 -14.99898,0"
+         style="opacity:0.24842769;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path6061-68-84"
+         d="m 773.20619,722.40028 -14.9838,0"
+         style="opacity:0.24842769;fill:none;stroke:#000000;stroke-width:1.00806725;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path6061-68-9"
+         d="m 773.20619,726.43359 -14.9838,0"
+         style="opacity:0.24842769;fill:none;stroke:#000000;stroke-width:1.00806725;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>