Merge branch '4.2.0-wip' of github.com:FortAwesome/Font-Awesome into 4.2.0-wip

* '4.2.0-wip' of github.com:FortAwesome/Font-Awesome:
  adding slideshare icon #1176

README.md

@@ -1,7 +1,7 @@
 #[Font Awesome v4.2.0](http://fontawesome.io)
 ###The iconic font and CSS framework
 
-Font Awesome is a full suite of 443 pictographic icons for easy scalable vector graphics on websites,
+Font Awesome is a full suite of 444 pictographic icons for easy scalable vector graphics on websites,
 created and maintained by [Dave Gandy](http://twitter.com/davegandy).
 Stay up to date [@fontawesome](http://twitter.com/fontawesome).
 

css/font-awesome.css

@@ -1590,3 +1590,6 @@
 .fa-plug:before {
   content: "\f1e6";
 }
+.fa-slideshare:before {
+  content: "\f1e7";
+}

less/icons.less

@@ -511,3 +511,4 @@
 .@{fa-css-prefix}-tty:before { content: @fa-var-tty; }
 .@{fa-css-prefix}-binoculars:before { content: @fa-var-binoculars; }
 .@{fa-css-prefix}-plug:before { content: @fa-var-plug; }
+.@{fa-css-prefix}-slideshare:before { content: @fa-var-slideshare; }

less/variables.less

@@ -401,6 +401,7 @@
 @fa-var-skype: "\f17e";
 @fa-var-slack: "\f198";
 @fa-var-sliders: "\f1de";
+@fa-var-slideshare: "\f1e7";
 @fa-var-smile-o: "\f118";
 @fa-var-soccer-ball-o: "\f1e3";
 @fa-var-sort: "\f0dc";

scss/_icons.scss

@@ -511,3 +511,4 @@
 .#{$fa-css-prefix}-tty:before { content: $fa-var-tty; }
 .#{$fa-css-prefix}-binoculars:before { content: $fa-var-binoculars; }
 .#{$fa-css-prefix}-plug:before { content: $fa-var-plug; }
+.#{$fa-css-prefix}-slideshare:before { content: $fa-var-slideshare; }

scss/_variables.scss

@@ -401,6 +401,7 @@ $fa-var-sitemap: "\f0e8";
 $fa-var-skype: "\f17e";
 $fa-var-slack: "\f198";
 $fa-var-sliders: "\f1de";
+$fa-var-slideshare: "\f1e7";
 $fa-var-smile-o: "\f118";
 $fa-var-soccer-ball-o: "\f1e3";
 $fa-var-sort: "\f0dc";

src/icons.yml

@@ -3298,3 +3298,10 @@ icons:
     created:    4.2
     categories:
       - Web Application Icons
+
+  - name:       Slideshare
+    id:         slideshare
+    unicode:    f1e7
+    created:    4.2
+    categories:
+      - Brand Icons