CNLive Android Team / CNVideoDemo · Commits

Commit 758e6b23f74d63233d79fb9351b0678847fdb64d

Authored by 朱显松
2 parents 696bb778 82665132

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNVideoDemo 

Conflicts:
	app/libs/libcnlivevideo.jar
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
.idea/misc.xml
  View file @758e6b2
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <ConfirmationsSetting value="0" id="Add" /> 37 <ConfirmationsSetting value="0" id="Add" />
38 <ConfirmationsSetting value="0" id="Remove" /> 38 <ConfirmationsSetting value="0" id="Remove" />
39 </component> 39 </component>
40 - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> 40 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
41 <output url="file://$PROJECT_DIR$/build/classes" /> 41 <output url="file://$PROJECT_DIR$/build/classes" />
42 </component> 42 </component>
43 <component name="ProjectType"> 43 <component name="ProjectType">