Skip to content

Commit

Permalink
Merge branch 'release/v0.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ColdenCullen committed Apr 29, 2014
2 parents 45755c4 + 707cbe9 commit a3242a3
Show file tree
Hide file tree
Showing 28 changed files with 1,350 additions and 869 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Dash Logo](https://cloud.githubusercontent.com/assets/512416/2726786/6618d624-c5c2-11e3-9049-23637e5a1739.png)](https://github.com/Circular-Studios/Dash/wiki)

# [![Build Status](http://img.shields.io/travis/Circular-Studios/Dash/develop.svg?style=flat)](https://travis-ci.org/Circular-Studios/Dash) [![Docs](http://img.shields.io/badge/docs-ddoc-yellow.svg?style=flat)](http://circular-studios.github.io/Dash/docs/) [![Gitter Chat](http://img.shields.io/badge/chat-gitter-brightgreen.svg?style=flat)](https://gitter.im/Circular-Studios/Dash) [![Release](http://img.shields.io/github/release/Circular-Studios/Dash.svg?style=flat)](http://code.dlang.org/packages/dash)
# [![Build Status](http://img.shields.io/travis/Circular-Studios/Dash/develop.svg?style=flat)](https://travis-ci.org/Circular-Studios/Dash) [![Docs](http://img.shields.io/badge/docs-ddoc-yellow.svg?style=flat)](http://circular-studios.github.io/Dash/docs/v0.6.6) [![Gitter Chat](http://img.shields.io/badge/chat-gitter-brightgreen.svg?style=flat)](https://gitter.im/Circular-Studios/Dash) [![Release](http://img.shields.io/github/release/Circular-Studios/Dash.svg?style=flat)](http://code.dlang.org/packages/dash)

If you're reading this page, chances are you fall into one of the following categories:

Expand Down
12 changes: 3 additions & 9 deletions dub.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"derelict-assimp3": "~master",
"dyaml": "~master",
"gl3n-shared" : "~master",
"dlogg": ">=0.1.3"
"dlogg": "~>0.2.2",
"x11": { "version": "==1.0.0", "optional": true }
},
"targetName": "dash",
"targetType": "library",
Expand All @@ -34,12 +35,5 @@
"libs-windows": [
"gdi32", "ole32", "kernel32",
"user32", "comctl32", "comdlg32"
],

"dependencies-linux": {
"x11": {
"version": "~master",
"optional": true
}
}
]
}
Loading

0 comments on commit a3242a3

Please sign in to comment.