Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkw committed Dec 28, 2014
2 parents 6daab01 + 49b9010 commit 096d68b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
sudo: false
language: java
before_success: gradle dccJar
deploy:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
decaf
=====

[![Build Status](https://travis-ci.org/hawkw/decaf.svg)](https://travis-ci.org/hawkw/decaf) [![Latest ScalaDoc](https://img.shields.io/badge/scaladoc-latest-brightgreen.svg?style=flat)](https://hawkw.github.io/decaf/scaladoc/index.html) [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
[![Build Status](https://travis-ci.org/hawkw/decaf.svg)](https://travis-ci.org/hawkw/decaf) [![GitHub release](https://img.shields.io/github/release/hawkw/decaf.svg?style=flat)](https://github.com/hawkw/decaf/releases) [![Latest ScalaDoc](https://img.shields.io/badge/scaladoc-latest-brightgreen.svg?style=flat)](https://hawkw.github.io/decaf/scaladoc/index.html) [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)

Decaf is an alleged programming language. It's kinda like Java but a lot less so.

Expand Down

0 comments on commit 096d68b

Please sign in to comment.