-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
- Loading branch information
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
#Fri Jun 23 10:23:47 CEST 2017 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="output$Generated" generated="true"><source path="/Users/hugo/.android/build-cache/1d6dbe1df4904c8c0bb5a5962bec2e25bd534137/output/res"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/intermediates/bundles/debug/res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/androidTest/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/androidTest/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/androidTest/debug"/></dataSet><dataSet config="output" from-dependency="true" generated-set="output$Generated"><source path="/Users/hugo/.android/build-cache/1d6dbe1df4904c8c0bb5a5962bec2e25bd534137/output/res"/></dataSet><dataSet config="debug" from-dependency="true" generated-set="debug$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/intermediates/bundles/debug/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/androidTest/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/androidTest/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/androidTest/debug"/></dataSet><mergedItems/></merger> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/assets"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/assets/shaders/debug"/></dataSet><dataSet config="debug"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/assets"/></dataSet></merger> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
#Fri Jun 23 10:23:47 CEST 2017 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="output$Generated" generated="true"><source path="/Users/hugo/.android/build-cache/1d6dbe1df4904c8c0bb5a5962bec2e25bd534137/output/res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/res"/></dataSet><dataSet config="output" from-dependency="true" generated-set="output$Generated"><source path="/Users/hugo/.android/build-cache/1d6dbe1df4904c8c0bb5a5962bec2e25bd534137/output/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/res"/></dataSet><mergedItems/></merger> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/shaders"/></dataSet><dataSet config="debug"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/shaders"/></dataSet></merger> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/assets"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/assets/shaders/release"/></dataSet><dataSet config="release"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/release/assets"/></dataSet></merger> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/shaders"/></dataSet><dataSet config="release"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/release/shaders"/></dataSet></merger> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
#Fri Jun 23 10:23:47 CEST 2017 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/res"/></dataSet><mergedItems/></merger> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
#Fri Jun 23 10:23:47 CEST 2017 |