From 521e435d5d63fc76097e6667ba5ef9bcd1393a7b Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 16:35:32 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 51aa272..2b3a01a 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\rs\debug"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res"><file name="main" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\layout\main.xml" qualifiers="" type="layout"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\values\strings.xml" qualifiers=""><string name="source_prompt">Media source</string><string name="source_select">Please select the media source</string><string-array name="source_array">
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\rs\debug"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res"><file name="main" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\layout\main.xml" qualifiers="" type="layout"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\values\strings.xml" qualifiers=""><string name="addface_native">AddFace</string><string name="source_prompt">Media source</string><string name="source_select">Please select the media source</string><string-array name="source_array">
<item>clips/testfile.mp4</item>
<item>clips/aa.mp4</item>
<item>clips/cc.mp4</item>
--
Gitblit v1.8.0