From 640f3174608fa0c6e63beebff5b095a7ea5f2706 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Mon, 10 Dec 2012 08:33:47 +0000
Subject: [PATCH] 

---
 src/com/upc/pbe/upcnews/MainActivity.java | 2 +-
 src/com/upc/pbe/upcnews/Prefs.java        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index e1b05ec..485d7e0 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -106,7 +106,7 @@ public class MainActivity extends Activity implements OnClickListener {
 	}
 	/*
 	 * COSAS POR HACER
-	 * Qué coño pasa con los codecs -- Yo
+	 * Que cojones pasa con los codecs -- Yo
 	 * Descarga en segundo plano (Mejora dificil)
 	 * Lentitud descarga -- Todos (este miercoles)
 	 * CRASH AL DARLE A LA TECLA MENU DENTRO DE LAS PREFERENCES -- Marc
diff --git a/src/com/upc/pbe/upcnews/Prefs.java b/src/com/upc/pbe/upcnews/Prefs.java
index af31b9d..b954bc6 100644
--- a/src/com/upc/pbe/upcnews/Prefs.java
+++ b/src/com/upc/pbe/upcnews/Prefs.java
@@ -3,6 +3,7 @@ package com.upc.pbe.upcnews;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.util.Log;
+import android.view.Menu;
 
 //Menu de preferencies
 public class Prefs extends PreferenceActivity {
@@ -15,5 +16,10 @@ public class Prefs extends PreferenceActivity {
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(R.xml.prefs);
 	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		return false;
+	}
 
 }
\ No newline at end of file
--
libgit2 0.22.2