Merge branch 'develop' into merge/develop

trunk/configure

@@ -387,9 +387,6 @@ fi
 if [[ $SRS_FFMPEG_FIT == YES ]]; then
     ModuleLibFiles+=("${LibFfmpegFile[*]}")
 fi
-if [[ $SRS_GB28181 == YES ]]; then
-    ModuleLibFiles+=("${LibIconvfile[*]}")
-fi
 #
 for SRS_MODULE in ${SRS_MODULES[*]}; do
     . auto/reset_module.sh && . $SRS_MODULE/config
@@ -428,9 +425,6 @@ if [ $SRS_UTEST = YES ]; then
     if [[ $SRS_SRT == YES ]]; then
         ModuleLibFiles+=("${LibSRTfile[*]}")
     fi
-    if [[ $SRS_GB28181 == YES ]]; then
-        ModuleLibFiles+=("${LibIconvfile[*]}")
-    fi
     MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
     if [[ $SRS_SRT == YES ]]; then
         MODULE_DEPENDS+=("SRT")

trunk/scripts/git.commit.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 
-for file in $(git remote); do echo ""; git push $file $@; done
+#for file in $(git remote); do echo ""; git push $file $@; done
+for file in $(git remote -v|grep -v https|grep push|awk '{print $1}'); do echo ""; git push $file $@; done