Merge remote-tracking branch 'origin/master' (35e5d031) | Commits | CNLive Android Team / CNVideoDemo

Authored by 王琳 2017-05-02 11:14:51 +0800

# Conflicts:
#	app/libs/libcnliveutil.jar

Showing 1 changed file with 3 additions and 0 deletions

.idea/markdown-navigator/profiles_settings.xml 0 → 100644

	1	+<component name="MarkdownNavigator.ProfileManager">
	2	+ <settings default="" pdf-export="" />
	3	+</component>
0	4	\ No newline at end of file
...	...

CNLive Android Team / CNVideoDemo · Commits