diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2012-12-22 23:11:02 +0100 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2012-12-22 23:11:02 +0100 |
| commit | f0f68fd015768d67735759f90e609407c7fb728d (patch) | |
| tree | c5fd697a5484e6795e77c941e8646405ff626312 /src/de/danoeh/antennapod/activity | |
| parent | ea8ee6e917ea95cac44c3a2e5775bf887158580d (diff) | |
| parent | 38cea758bf261f8898864499124e3244683b2208 (diff) | |
| download | AntennaPod-f0f68fd015768d67735759f90e609407c7fb728d.zip | |
Merge branch 'develop' into issue-49
Diffstat (limited to 'src/de/danoeh/antennapod/activity')
| -rw-r--r-- | src/de/danoeh/antennapod/activity/MainActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java index 902869a80..bfd99016f 100644 --- a/src/de/danoeh/antennapod/activity/MainActivity.java +++ b/src/de/danoeh/antennapod/activity/MainActivity.java @@ -160,7 +160,7 @@ public class MainActivity extends SherlockFragmentActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = new MenuInflater(this); - inflater.inflate(R.menu.podfetcher, menu); + inflater.inflate(R.menu.main, menu); return true; } |