Merge branch 'develop'

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 5feacb10d922 · 2014-05-23T19:37:08.000-04:00
Conflicts:
	app/SConscript
diff --git a/app/SConscript b/app/SConscript
@@ -86,7 +86,6 @@ avplayer = env.Program(
                 ]
         )
 
-env.Depends( avinfo, sAvTranscoder )
 env.Depends( avmeta, sAvTranscoder )
 env.Depends( audioRewrapper, sAvTranscoder )
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ avplayer = env.Program(`
`86`	`86`	`]`
`87`	`87`	`)`
`88`	`88`
`89`		`-env.Depends( avinfo, sAvTranscoder )`
`90`	`89`	`env.Depends( avmeta, sAvTranscoder )`
`91`	`90`	`env.Depends( audioRewrapper, sAvTranscoder )`
`92`	`91`