Commit6774f5e

committed

Merge branch 'master' of github.com:schworer/zencoder-py

2 parents3db5207 +7740f23 commit6774f5eCopy full SHA for 6774f5e

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ or with pip:`
`10`	`10`
`11`	`11`	`##Dependencies`
`12`	`12`	`zencoder-py depends on[httplib2](http://code.google.com/p/httplib2/)`
	`13`	`+it uses the json module, which is only in 2.6 python or greater`
	`14`	`+and will depend on some package for xml`
`13`	`15`
`14`	`16`	`it uses the json module, which is only in 2.6 python or greater`
`15`	`17`

Comments

(0)