Skip to content

Commit

Permalink
Merge branch 'release/v2.9.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikepenz
mikepenz committed Oct 29, 2017
2 parents f5327f1 + 06a72a8 commit 9fc0294
Show file tree
Hide file tree
Showing 108 changed files with 8,992 additions and 2,482 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ build/

# Local configuration file (sdk path, etc)
local.properties
/captures

# Proguard folder generated by Eclipse
proguard/
Expand Down
Empty file removed .gradletasknamecache
View file
Empty file.
2,048 changes: 2,048 additions & 0 deletions FONT_IDS/_current_community_material_design_v2.0.46.1.xml
View file

Large diffs are not rendered by default.

164 changes: 164 additions & 0 deletions FONT_IDS/_current_dev_icon_v2.0.0.1.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
<resources>
<string name="dev_ssh_plain_wordmark">dev_ssh_plain_wordmark</string>
<string name="dev_ssh_plain">dev_ssh_plain</string>
<string name="dev_sourcetree_plain_wordmark">dev_sourcetree_plain_wordmark</string>
<string name="dev_sourcetree_plain">dev_sourcetree_plain</string>
<string name="dev_phpstorm_plain_wordmark">dev_phpstorm_plain_wordmark</string>
<string name="dev_phpstorm_plain">dev_phpstorm_plain</string>
<string name="dev_jeet_plain_wordmark">dev_jeet_plain_wordmark</string>
<string name="dev_jeet_plain">dev_jeet_plain</string>
<string name="dev_gitlab_plain_wordmark">dev_gitlab_plain_wordmark</string>
<string name="dev_gitlab_plain">dev_gitlab_plain</string>
<string name="dev_github_plain_wordmark">dev_github_plain_wordmark</string>
<string name="dev_github_plain">dev_github_plain</string>
<string name="dev_d3js_plain">dev_d3js_plain</string>
<string name="dev_confluence_plain_wordmark">dev_confluence_plain_wordmark</string>
<string name="dev_confluence_plain">dev_confluence_plain</string>
<string name="dev_bitbucket_plain_wordmark">dev_bitbucket_plain_wordmark</string>
<string name="dev_bitbucket_plain">dev_bitbucket_plain</string>
<string name="dev_safari_line_wordmark">dev_safari_line_wordmark</string>
<string name="dev_safari_line">dev_safari_line</string>
<string name="dev_safari_plain_wordmark">dev_safari_plain_wordmark</string>
<string name="dev_safari_plain">dev_safari_plain</string>
<string name="dev_jetbrains_plain_wordmark">dev_jetbrains_plain_wordmark</string>
<string name="dev_django_line_wordmark">dev_django_line_wordmark</string>
<string name="dev_django_plain_wordmark">dev_django_plain_wordmark</string>
<string name="dev_gimp_plain">dev_gimp_plain</string>
<string name="dev_redhat_plain_wordmark">dev_redhat_plain_wordmark</string>
<string name="dev_redhat_plain">dev_redhat_plain</string>
<string name="dev_cplusplus_line_wordmark">dev_cplusplus_line_wordmark</string>
<string name="dev_cplusplus_plain_wordmark">dev_cplusplus_plain_wordmark</string>
<string name="dev_csharp_line_wordmark">dev_csharp_line_wordmark</string>
<string name="dev_csharp_plain_wordmark">dev_csharp_plain_wordmark</string>
<string name="dev_c_line_wordmark">dev_c_line_wordmark</string>
<string name="dev_c_plain_wordmark">dev_c_plain_wordmark</string>
<string name="dev_nodewebkit_line_wordmark">dev_nodewebkit_line_wordmark</string>
<string name="dev_nodewebkit_line">dev_nodewebkit_line</string>
<string name="dev_nodewebkit_plain_wordmark">dev_nodewebkit_plain_wordmark</string>
<string name="dev_nodewebkit_plain">dev_nodewebkit_plain</string>
<string name="dev_nginx_plain_wordmark">dev_nginx_plain_wordmark</string>
<string name="dev_erlang_plain_wordmark">dev_erlang_plain_wordmark</string>
<string name="dev_erlang_plain">dev_erlang_plain</string>
<string name="dev_doctrine_line_wordmark">dev_doctrine_line_wordmark</string>
<string name="dev_doctrine_line">dev_doctrine_line</string>
<string name="dev_doctrine_plain_wordmark">dev_doctrine_plain_wordmark</string>
<string name="dev_doctrine_plain">dev_doctrine_plain</string>
<string name="dev_apache_line_wordmark">dev_apache_line_wordmark</string>
<string name="dev_apache_line">dev_apache_line</string>
<string name="dev_apache_plain_wordmark">dev_apache_plain_wordmark</string>
<string name="dev_apache_plain">dev_apache_plain</string>
<string name="dev_go_line">dev_go_line</string>
<string name="dev_redis_plain_wordmark">dev_redis_plain_wordmark</string>
<string name="dev_redis_plain">dev_redis_plain</string>
<string name="dev_meteor_plain_wordmark">dev_meteor_plain_wordmark</string>
<string name="dev_meteor_plain">dev_meteor_plain</string>
<string name="dev_heroku_original_wordmark">dev_heroku_original_wordmark</string>
<string name="dev_heroku_original">dev_heroku_original</string>
<string name="dev_heroku_plain_wordmark">dev_heroku_plain_wordmark</string>
<string name="dev_heroku_plain">dev_heroku_plain</string>
<string name="dev_go_plain">dev_go_plain</string>
<string name="dev_docker_plain_wordmark">dev_docker_plain_wordmark</string>
<string name="dev_docker_plain">dev_docker_plain</string>
<string name="dev_amazonwebservices_plain">dev_amazonwebservices_plain</string>
<string name="dev_amazonwebservices_plain_wordmark">dev_amazonwebservices_plain_wordmark</string>
<string name="dev_android_plain_wordmark">dev_android_plain_wordmark</string>
<string name="dev_android_plain">dev_android_plain</string>
<string name="dev_angularjs_plain_wordmark">dev_angularjs_plain_wordmark</string>
<string name="dev_angularjs_plain">dev_angularjs_plain</string>
<string name="dev_appcelerator_plain">dev_appcelerator_plain</string>
<string name="dev_appcelerator_plain_wordmark">dev_appcelerator_plain_wordmark</string>
<string name="dev_apple_plain">dev_apple_plain</string>
<string name="dev_atom_plain_wordmark">dev_atom_plain_wordmark</string>
<string name="dev_atom_plain">dev_atom_plain</string>
<string name="dev_backbonejs_plain_wordmark">dev_backbonejs_plain_wordmark</string>
<string name="dev_backbonejs_plain">dev_backbonejs_plain</string>
<string name="dev_bootstrap_plain_wordmark">dev_bootstrap_plain_wordmark</string>
<string name="dev_bootstrap_plain">dev_bootstrap_plain</string>
<string name="dev_bower_line_wordmark">dev_bower_line_wordmark</string>
<string name="dev_bower_line">dev_bower_line</string>
<string name="dev_bower_plain_wordmark">dev_bower_plain_wordmark</string>
<string name="dev_bower_plain">dev_bower_plain</string>
<string name="dev_chrome_plain_wordmark">dev_chrome_plain_wordmark</string>
<string name="dev_chrome_plain">dev_chrome_plain</string>
<string name="dev_codeigniter_plain_wordmark">dev_codeigniter_plain_wordmark</string>
<string name="dev_codeigniter_plain">dev_codeigniter_plain</string>
<string name="dev_coffeescript_plain_wordmark">dev_coffeescript_plain_wordmark</string>
<string name="dev_coffeescript_plain">dev_coffeescript_plain</string>
<string name="dev_css3_plain_wordmark">dev_css3_plain_wordmark</string>
<string name="dev_css3_plain">dev_css3_plain</string>
<string name="dev_debian_plain_wordmark">dev_debian_plain_wordmark</string>
<string name="dev_debian_plain">dev_debian_plain</string>
<string name="dev_dot_net_plain_wordmark">dev_dot_net_plain_wordmark</string>
<string name="dev_dot_net_plain">dev_dot_net_plain</string>
<string name="dev_drupal_plain_wordmark">dev_drupal_plain_wordmark</string>
<string name="dev_drupal_plain">dev_drupal_plain</string>
<string name="dev_firefox_plain_wordmark">dev_firefox_plain_wordmark</string>
<string name="dev_firefox_plain">dev_firefox_plain</string>
<string name="dev_foundation_plain_wordmark">dev_foundation_plain_wordmark</string>
<string name="dev_foundation_plain">dev_foundation_plain</string>
<string name="dev_git_plain_wordmark">dev_git_plain_wordmark</string>
<string name="dev_git_plain">dev_git_plain</string>
<string name="dev_grunt_line_wordmark">dev_grunt_line_wordmark</string>
<string name="dev_grunt_line">dev_grunt_line</string>
<string name="dev_grunt_plain_wordmark">dev_grunt_plain_wordmark</string>
<string name="dev_grunt_plain">dev_grunt_plain</string>
<string name="dev_gulp_plain">dev_gulp_plain</string>
<string name="dev_html5_plain_wordmark">dev_html5_plain_wordmark</string>
<string name="dev_html5_plain">dev_html5_plain</string>
<string name="dev_ie10_plain">dev_ie10_plain</string>
<string name="dev_illustrator_line">dev_illustrator_line</string>
<string name="dev_illustrator_plain">dev_illustrator_plain</string>
<string name="dev_inkscape_plain_wordmark">dev_inkscape_plain_wordmark</string>
<string name="dev_inkscape_plain">dev_inkscape_plain</string>
<string name="dev_java_plain_wordmark">dev_java_plain_wordmark</string>
<string name="dev_java_plain">dev_java_plain</string>
<string name="dev_javascript_plain">dev_javascript_plain</string>
<string name="dev_jquery_plain_wordmark">dev_jquery_plain_wordmark</string>
<string name="dev_jquery_plain">dev_jquery_plain</string>
<string name="dev_krakenjs_plain_wordmark">dev_krakenjs_plain_wordmark</string>
<string name="dev_krakenjs_plain">dev_krakenjs_plain</string>
<string name="dev_laravel_plain_wordmark">dev_laravel_plain_wordmark</string>
<string name="dev_laravel_plain">dev_laravel_plain</string>
<string name="dev_less_plain_wordmark">dev_less_plain_wordmark</string>
<string name="dev_linux_plain">dev_linux_plain</string>
<string name="dev_mongodb_plain_wordmark">dev_mongodb_plain_wordmark</string>
<string name="dev_mongodb_plain">dev_mongodb_plain</string>
<string name="dev_moodle_plain_wordmark">dev_moodle_plain_wordmark</string>
<string name="dev_moodle_plain">dev_moodle_plain</string>
<string name="dev_mysql_plain_wordmark">dev_mysql_plain_wordmark</string>
<string name="dev_mysql_plain">dev_mysql_plain</string>
<string name="dev_nodejs_plain_wordmark">dev_nodejs_plain_wordmark</string>
<string name="dev_nodejs_plain">dev_nodejs_plain</string>
<string name="dev_oracle_plain">dev_oracle_plain</string>
<string name="dev_photoshop_line">dev_photoshop_line</string>
<string name="dev_photoshop_plain">dev_photoshop_plain</string>
<string name="dev_php_plain">dev_php_plain</string>
<string name="dev_postgresql_plain_wordmark">dev_postgresql_plain_wordmark</string>
<string name="dev_postgresql_plain">dev_postgresql_plain</string>
<string name="dev_python_plain_wordmark">dev_python_plain_wordmark</string>
<string name="dev_python_plain">dev_python_plain</string>
<string name="dev_rails_plain_wordmark">dev_rails_plain_wordmark</string>
<string name="dev_rails_plain">dev_rails_plain</string>
<string name="dev_react_plain_wordmark">dev_react_plain_wordmark</string>
<string name="dev_react_plain">dev_react_plain</string>
<string name="dev_ruby_plain_wordmark">dev_ruby_plain_wordmark</string>
<string name="dev_ruby_plain">dev_ruby_plain</string>
<string name="dev_sass_plain">dev_sass_plain</string>
<string name="dev_symfony_plain_wordmark">dev_symfony_plain_wordmark</string>
<string name="dev_symfony_plain">dev_symfony_plain</string>
<string name="dev_travis_plain_wordmark">dev_travis_plain_wordmark</string>
<string name="dev_travis_plain">dev_travis_plain</string>
<string name="dev_trello_plain_wordmark">dev_trello_plain_wordmark</string>
<string name="dev_trello_plain">dev_trello_plain</string>
<string name="dev_ubuntu_plain_wordmark">dev_ubuntu_plain_wordmark</string>
<string name="dev_ubuntu_plain">dev_ubuntu_plain</string>
<string name="dev_vim_plain">dev_vim_plain</string>
<string name="dev_windows8_plain_wordmark">dev_windows8_plain_wordmark</string>
<string name="dev_windows8_plain">dev_windows8_plain</string>
<string name="dev_wordpress_plain_wordmark">dev_wordpress_plain_wordmark</string>
<string name="dev_wordpress_plain">dev_wordpress_plain</string>
<string name="dev_yii_plain_wordmark">dev_yii_plain_wordmark</string>
<string name="dev_yii_plain">dev_yii_plain</string>
<string name="dev_zend_plain_wordmark">dev_zend_plain_wordmark</string>
<string name="dev_zend_plain">dev_zend_plain</string>
</resources>
Loading

0 comments on commit 9fc0294

Please sign in to comment.