Merge branch 'release/0.4' into develop

shidarin · Apr 23, 2014 · d08ec56 · d08ec56
2 parents 2723fad + 118c9e1
commit d08ec56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 CDL Convert
 ==========
 
-[![Build Status](https://travis-ci.org/shidarin/cdl_convert.svg?branch=develop)](https://travis-ci.org/shidarin/cdl_convert)[![Coverage Status](https://coveralls.io/repos/shidarin/cdl_convert/badge.png?branch=develop)](https://coveralls.io/r/shidarin/cdl_convert?branch=develop)
+[![Build Status](https://travis-ci.org/shidarin/cdl_convert.svg?branch=master)](https://travis-ci.org/shidarin/cdl_convert)[![Coverage Status](https://coveralls.io/repos/shidarin/cdl_convert/badge.png?branch=master)](https://coveralls.io/r/shidarin/cdl_convert?branch=master)
 
 Converts between common [ASC CDL](http://en.wikipedia.org/wiki/ASC_CDL)
 formats. The [American Society of Cinematographers](http://www.theasc.com/) Color

diff --git a/cdl_convert.py b/cdl_convert.py
@@ -2,6 +2,7 @@
 # CDL Convert
 # Converts between common ASC CDL formats
 # By Sean Wallitsch, 2014/04/16
+__version__ = 0.4
 
 """