Merge branch 'master' into develop

sun363587351 · Sep 14, 2014 · a951727 · a951727
2 parents 2623f93 + e02fc32
commit a951727
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,6 +13,3 @@
 [submodule "fontconfig"]
 	path = fontconfig
 	url = git://anongit.freedesktop.org/fontconfig
-[submodule "SampleFFmpegApp"]
-	path = SampleFFmpegApp
-	url = https://github.com/hiteshsondhi88/SampleFFmpegApp.git
diff --git a/SampleFFmpegApp b/SampleFFmpegApp