Merge remote branch 'upstream/master'

Conflicts:
	.gitignore

diff --cc .gitignore
Simple merge

diff --cc guilib/Key.h
Simple merge

diff --cc language/English/strings.xml
Simple merge

diff --cc xbmc/ButtonTranslator.cpp
Simple merge

diff --cc xbmc/FileSystem/DllLibCMyth.h
Simple merge

diff --cc xbmc/GUIDialogVideoSettings.cpp
Simple merge

diff --cc xbmc/GUIWindowFullScreen.cpp
Simple merge

diff --cc xbmc/Settings.cpp
Simple merge

diff --cc xbmc/settings/VideoSettings.h
Simple merge

diff --cc xbmc/utils/TextSearch.h
index 90bc639,0000000..cfcade6
mode 100644,000000..100644
--- 1/xbmc/utils/TextSearch.h
--- /dev/null
+++ b/xbmc/utils/TextSearch.h
@@@ -1,48 -1,0 +1,48 @@@
- #pragma once\r
- /*\r
-  *      Copyright (C) 2005-2009 Team XBMC\r
-  *      http://www.xbmc.org\r
-  *\r
-  *  This Program is free software; you can redistribute it and/or modify\r
-  *  it under the terms of the GNU General Public License as published by\r
-  *  the Free Software Foundation; either version 2, or (at your option)\r
-  *  any later version.\r
-  *\r
-  *  This Program is distributed in the hope that it will be useful,\r
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-  *  GNU General Public License for more details.\r
-  *\r
-  *  You should have received a copy of the GNU General Public License\r
-  *  along with XBMC; see the file COPYING.  If not, write to\r
-  *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.\r
-  *  http://www.gnu.org/copyleft/gpl.html\r
-  *\r
-  */\r
++#pragma once
++/*
++ *      Copyright (C) 2005-2009 Team XBMC
++ *      http://www.xbmc.org
++ *
++ *  This Program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2, or (at your option)
++ *  any later version.
++ *
++ *  This Program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with XBMC; see the file COPYING.  If not, write to
++ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++ *  http://www.gnu.org/copyleft/gpl.html
++ *
++ */
 +
 +#include <vector>
 +#include "StringUtils.h"
- \r
- class cTextSearch\r
- {\r
- public:\r
++
++class cTextSearch
++{
++public:
 +  cTextSearch(void);
-   cTextSearch(CStdString text, CStdString searchText, bool caseSensitive);\r
++  cTextSearch(CStdString text, CStdString searchText, bool caseSensitive);
 +  virtual ~cTextSearch(void);
 +
 +  void SetText(CStdString text, CStdString searchText, bool caseSensitive);
 +  bool DoSearch();
 +
 +  static bool SearchText(CStdString text, CStdString searchText, bool caseSensitive);
 +
 +private:
 +  void ClearBlankCharacter(CStdString *text, int pos);
 +
 +  CStdString m_text;
 +  CStdString m_searchText;
 +  std::vector<CStdString>  m_AND;
 +  std::vector<CStdString>  m_OR;
 +  std::vector<CStdString>  m_NOT;
-   bool m_CaseSensitive;\r
- };\r
- \r
++  bool m_CaseSensitive;
++};
++