diff options
| author | Camil Staps | 2015-06-10 13:16:16 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-10 13:16:16 +0200 |
| commit | dd9c36491ab017795a71bdc4624281b65dcabd11 (patch) | |
| tree | a99376c8d15be4f1bb6b66aa80600c5011c74a18 /app/src/main/res/drawable-xxhdpi | |
| parent | IT WORKS (diff) | |
| parent | Aligned (EDIT) to the right (diff) | |
Merge branch 'master' of github:camilstaps/RSSin
Conflicts:
app/src/main/java/org/rssin/android/FeedSorterTrainer.java
app/src/main/java/org/rssin/neurons/FeedSorter.java
app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java
app/src/main/java/org/rssin/neurons/NeuralNetwork.java
app/src/main/java/org/rssin/rssin/SortedFeedItemContainer.java
Diffstat (limited to 'app/src/main/res/drawable-xxhdpi')
| -rwxr-xr-x | app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png | bin | 0 -> 444 bytes |
| -rwxr-xr-x | app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png | bin | 0 -> 1289 bytes |
| -rwxr-xr-x | app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png | bin | 0 -> 678 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png Binary files differnew file mode 100755 index 0000000..c1fbf46 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png Binary files differnew file mode 100755 index 0000000..a68f6f9 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png Binary files differnew file mode 100755 index 0000000..ef5e602 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png |
