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/menu/home_screen.xml | |
| 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/menu/home_screen.xml')
| -rwxr-xr-x | app/src/main/res/menu/home_screen.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/res/menu/home_screen.xml b/app/src/main/res/menu/home_screen.xml index a894d92..bf901df 100755 --- a/app/src/main/res/menu/home_screen.xml +++ b/app/src/main/res/menu/home_screen.xml @@ -3,5 +3,5 @@ xmlns:tools="http://schemas.android.com/tools"
tools:context="org.rssin.android.HomeScreenActivity">
<item android:id="@+id/action_settings" android:title="@string/action_settings"
- android:orderInCategory="100" app:showAsAction="ifRoom" />
+ android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" />
</menu>
|