1.6.0

CHANGELOG.md

@@ -3,15 +3,16 @@
 ### Versions
 
 [v1.1](#v1.1)
-
 [v1.2](#v1.2)
-
 [v1.3](#v1.3)
-
 [v1.3.1](#v1.3.1)
-<<<<<<< HEAD
 [1.4.0](#1.4.0)
 [1.5.0](#1.5.0)
+[1.6.0](#1.5.0)
+
+## 1.5.0
+Change log and fixes in version 1.6.0:
+1. Added Komodo, Coda, Bintray, Terminal, Source code, Responsive web design, Dart, Aptana, MailChimp, NetBeans, Dreamweaver, Brackets, Eclipse, Cloud9, Scrum, MongoDB and Prolog icons.
 
 ## 1.5.0
 Change log and fixes in version 1.5.0:
@@ -21,7 +22,7 @@ Change log and fixes in version 1.5.0:
 
 =======
 [1.4.0](#v1.4.0)
->>>>>>> a37134208884d700f30b93ae3cc5c0442ae4937c
+
 
 ## 1.4.0
 Change log and fixes in version 1.4.0:

README.md

@@ -11,7 +11,7 @@ Devicons is a full stack iconic font ready to be shipped with your next project.
 Devicons iconic font is free to use and licensed under [MIT](http://opensource.org/licenses/MIT).  
 
 
-###Devicons icon set  1.5.0
+###Devicons icon set  1.6.0
 ![Devicons](http://i.imgur.com/VcgLGHN.png?1?6481)
 
 ## Use Devicons with a single line of code.
@@ -44,22 +44,6 @@ IcoMoon is your dear friend. Load your SVG file into IcoMoon, make any changes a
 
 You may also take a look at [Devicons Cheatsheet](http://vorillaz.github.io/devicons/#cheat)
 
-##Upcoming releases
-New icons to be added in v.1.5.0
-
-**Node.js & Stuff:** Express, Sails
-
-**IDES:** Coda, Espresso, Sublime text
-
-**CSS & Preprocessors:** Bourbon
-
-**Javascript:**  Handlebars.js, Marionette.js, QUnit.js,  YUI
-
-**PHP and Stuff:** CakePHP
-
-**Miscellaneous:** Piwik, Google Maps, Alfred app
-
-
 Do you have any additional request? Drop me a line or support an issue.
 
 

css/devicons.css

@@ -1,6 +1,7 @@
 /*!
- *  Devicons 1.5.0 made by Theodore Vorillas / http://vorillaz.com 
+ *  Devicons 1.6.0 made by Theodore Vorillas / http://vorillaz.com 
  */
+
 @font-face {
   font-family: 'devicons';
   src: url("../fonts/devicons.eot?xqxft6");
@@ -456,3 +457,60 @@
 
 .devicons-ruby_rough:before {
   content: "\e691"; }
+
+.devicons-komodo:before {
+  content: "\e692"; }
+
+.devicons-coda:before {
+  content: "\e693"; }
+
+.devicons-bintray:before {
+  content: "\e694"; }
+
+.devicons-terminal:before {
+  content: "\e695"; }
+
+.devicons-code:before {
+  content: "\e696"; }
+
+.devicons-responsive:before {
+  content: "\e697"; }
+
+.devicons-dart:before {
+  content: "\e698"; }
+
+.devicons-aptana:before {
+  content: "\e699"; }
+
+.devicons-mailchimp:before {
+  content: "\e69a"; }
+
+.devicons-netbeans:before {
+  content: "\e69b"; }
+
+.devicons-dreamweaver:before {
+  content: "\e69c"; }
+
+.devicons-brackets:before {
+  content: "\e69d"; }
+
+.devicons-eclipse:before {
+  content: "\e69e"; }
+
+.devicons-cloud9:before {
+  content: "\e69f"; }
+
+.devicons-scrum:before {
+  content: "\e6a0"; }
+
+.devicons-prolog:before {
+  content: "\e6a1"; }
+
+.devicons-terminal_badge:before {
+  content: "\e6a2"; }
+
+.devicons-code_badge:before {
+  content: "\e6a3"; }
+
+.devicons-mongodb:before {
+  content: "\e6a4"; }

css/devicons.scss

@@ -1,5 +1,5 @@
 /*!
- *  Devicons 1.5.0 made by Theodore Vorillas / http://vorillaz.com 
+ *  Devicons 1.6.0 made by Theodore Vorillas / http://vorillaz.com 
  */
 @font-face {
 	font-family: 'devicons';
@@ -172,7 +172,26 @@ $devicons:	(git "\e602"),
 			(extjs "\e68e"),
 			(mootools_badge "\e68f"),
 			(mootools "\e690"),
-			(ruby_rough "\e691");
+			(ruby_rough "\e691"),
+			(komodo "\e692"),
+			(coda "\e693"),
+			(bintray "\e694"),
+			(terminal "\e695"),
+			(code "\e696"),
+			(responsive "\e697"),
+			(dart "\e698"),
+			(aptana "\e699"),
+			(mailchimp "\e69a"),
+			(netbeans "\e69b"),
+			(dreamweaver "\e69c"),
+			(brackets "\e69d"),
+			(eclipse "\e69e"),
+			(cloud9 "\e69f"),
+			(scrum "\e6a0"),
+			(prolog "\e6a1"),
+			(terminal_badge "\e6a2"),
+			(code_badge "\e6a3"),
+			(mongodb "\e6a4");
 
 @each $devicon in $devicons {
 	  $iconClass: nth($devicon, 1);