ref: 7b0beeeda74badb0748775df506ebe829b3fdf93
parent: e375a70c0377b69155d689cb2ea04a9b2b6ab044
parent: 973a167e8eea8f938ec4062fe6b66685b7bc0252
author: Ethan Hugg <[email protected]>
date: Mon Mar 24 04:49:05 EDT 2014
Merge pull request #567 from ylatuya/android Fix line endings in manifest files
--- a/codec/build/android/dec/AndroidManifest.xml
+++ b/codec/build/android/dec/AndroidManifest.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.wels.dec"
- android:versionCode="1"
- android:versionName="1.0">
-<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
- <application android:icon="@drawable/icon" android:label="@string/app_name">
- <activity android:name=".WelsDecTest"
- android:label="@string/app_name">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- </application>
-
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.wels.dec"
+ android:versionCode="1"
+ android:versionName="1.0">
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
+ <application android:icon="@drawable/icon" android:label="@string/app_name">
+ <activity android:name=".WelsDecTest"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ </application>
+
+
</manifest>
\ No newline at end of file
--- a/codec/build/android/enc/AndroidManifest.xml
+++ b/codec/build/android/enc/AndroidManifest.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.wels.enc"
- android:versionCode="1"
- android:versionName="1.0">
-<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
- <application android:icon="@drawable/icon" android:label="@string/app_name">
- <activity android:name=".WelsEncTest"
- android:label="@string/app_name">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- </application>
-
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.wels.enc"
+ android:versionCode="1"
+ android:versionName="1.0">
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
+ <application android:icon="@drawable/icon" android:label="@string/app_name">
+ <activity android:name=".WelsEncTest"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ </application>
+
+
</manifest>
\ No newline at end of file