diff options
| author | Camil Staps | 2015-06-10 22:58:20 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-10 22:58:20 +0200 |
| commit | 0e3c24d59c8b2e455b66a2adc100f70666b7e151 (patch) | |
| tree | a3736bcdb921ac18bea23da3d1abaa4d1a6f667c /app/src/main/res | |
| parent | working... (diff) | |
| parent | Merge branch 'master' of http://github.com/camilstaps/RSSin (diff) | |
Merge branch 'master' of github:camilstaps/RSSin
Conflicts:
app/src/main/java/org/rssin/android/FeedItemAdapter.java
app/src/main/java/org/rssin/rssin/Feed.java
Diffstat (limited to 'app/src/main/res')
26 files changed, 1 insertions, 4 deletions
diff --git a/app/src/main/res/drawable-hdpi/image1.png b/app/src/main/res/drawable-hdpi/image1.png Binary files differdeleted file mode 100644 index a1811d3..0000000 --- a/app/src/main/res/drawable-hdpi/image1.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/image2.png b/app/src/main/res/drawable-hdpi/image2.png Binary files differdeleted file mode 100644 index 243f396..0000000 --- a/app/src/main/res/drawable-hdpi/image2.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/image3.png b/app/src/main/res/drawable-hdpi/image3.png Binary files differdeleted file mode 100644 index 47547ff..0000000 --- a/app/src/main/res/drawable-hdpi/image3.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/image4.png b/app/src/main/res/drawable-hdpi/image4.png Binary files differdeleted file mode 100644 index 77fe64e..0000000 --- a/app/src/main/res/drawable-hdpi/image4.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/image5.png b/app/src/main/res/drawable-hdpi/image5.png Binary files differdeleted file mode 100644 index 0214f5e..0000000 --- a/app/src/main/res/drawable-hdpi/image5.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/image1.png b/app/src/main/res/drawable-mdpi/image1.png Binary files differdeleted file mode 100644 index a1811d3..0000000 --- a/app/src/main/res/drawable-mdpi/image1.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/image2.png b/app/src/main/res/drawable-mdpi/image2.png Binary files differdeleted file mode 100644 index 243f396..0000000 --- a/app/src/main/res/drawable-mdpi/image2.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/image3.png b/app/src/main/res/drawable-mdpi/image3.png Binary files differdeleted file mode 100644 index 47547ff..0000000 --- a/app/src/main/res/drawable-mdpi/image3.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/image4.png b/app/src/main/res/drawable-mdpi/image4.png Binary files differdeleted file mode 100644 index 77fe64e..0000000 --- a/app/src/main/res/drawable-mdpi/image4.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/image5.png b/app/src/main/res/drawable-mdpi/image5.png Binary files differdeleted file mode 100644 index 0214f5e..0000000 --- a/app/src/main/res/drawable-mdpi/image5.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/image1.png b/app/src/main/res/drawable-xhdpi/image1.png Binary files differdeleted file mode 100644 index a1811d3..0000000 --- a/app/src/main/res/drawable-xhdpi/image1.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/image2.png b/app/src/main/res/drawable-xhdpi/image2.png Binary files differdeleted file mode 100644 index 243f396..0000000 --- a/app/src/main/res/drawable-xhdpi/image2.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/image3.png b/app/src/main/res/drawable-xhdpi/image3.png Binary files differdeleted file mode 100644 index 47547ff..0000000 --- a/app/src/main/res/drawable-xhdpi/image3.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/image4.png b/app/src/main/res/drawable-xhdpi/image4.png Binary files differdeleted file mode 100644 index 77fe64e..0000000 --- a/app/src/main/res/drawable-xhdpi/image4.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/image5.png b/app/src/main/res/drawable-xhdpi/image5.png Binary files differdeleted file mode 100644 index 0214f5e..0000000 --- a/app/src/main/res/drawable-xhdpi/image5.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/image1.png b/app/src/main/res/drawable-xxhdpi/image1.png Binary files differdeleted file mode 100644 index a1811d3..0000000 --- a/app/src/main/res/drawable-xxhdpi/image1.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/image2.png b/app/src/main/res/drawable-xxhdpi/image2.png Binary files differdeleted file mode 100644 index 243f396..0000000 --- a/app/src/main/res/drawable-xxhdpi/image2.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/image3.png b/app/src/main/res/drawable-xxhdpi/image3.png Binary files differdeleted file mode 100644 index 47547ff..0000000 --- a/app/src/main/res/drawable-xxhdpi/image3.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/image4.png b/app/src/main/res/drawable-xxhdpi/image4.png Binary files differdeleted file mode 100644 index 77fe64e..0000000 --- a/app/src/main/res/drawable-xxhdpi/image4.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/image5.png b/app/src/main/res/drawable-xxhdpi/image5.png Binary files differdeleted file mode 100644 index 0214f5e..0000000 --- a/app/src/main/res/drawable-xxhdpi/image5.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/image1.png b/app/src/main/res/drawable-xxxhdpi/image1.png Binary files differdeleted file mode 100644 index a1811d3..0000000 --- a/app/src/main/res/drawable-xxxhdpi/image1.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/image2.png b/app/src/main/res/drawable-xxxhdpi/image2.png Binary files differdeleted file mode 100644 index 243f396..0000000 --- a/app/src/main/res/drawable-xxxhdpi/image2.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/image3.png b/app/src/main/res/drawable-xxxhdpi/image3.png Binary files differdeleted file mode 100644 index 47547ff..0000000 --- a/app/src/main/res/drawable-xxxhdpi/image3.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/image4.png b/app/src/main/res/drawable-xxxhdpi/image4.png Binary files differdeleted file mode 100644 index 77fe64e..0000000 --- a/app/src/main/res/drawable-xxxhdpi/image4.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/image5.png b/app/src/main/res/drawable-xxxhdpi/image5.png Binary files differdeleted file mode 100644 index 0214f5e..0000000 --- a/app/src/main/res/drawable-xxxhdpi/image5.png +++ /dev/null diff --git a/app/src/main/res/values/feeds.xml b/app/src/main/res/values/feeds.xml index 85e5c7a..720e029 100644..100755 --- a/app/src/main/res/values/feeds.xml +++ b/app/src/main/res/values/feeds.xml @@ -24,10 +24,7 @@ <item>http://feeds.bbci.co.uk/news/technology/rss.xml</item> <item>http://feeds.bbci.co.uk/news/world/rss.xml</item> <item>http://feeds.bbci.co.uk/sport/0/rss.xml</item> - <item>http://feeds.foxnews.com/foxnews/politics</item> - <item>http://feeds.foxnews.com/foxnews/science</item> - <item>http://feeds.foxnews.com/foxnews/sports</item> - <item>http://feeds.foxnews.com/foxnews/tech</item> + <item>http://pcworld.com/index.rss</item> <item>http://feeds.reuters.com/reuters/environment</item> <item>http://feeds.reuters.com/reuters/financialsNews</item> <item>http://feeds.reuters.com/reuters/worldNews</item> |
