[quake3/f14: 6/6] Merge remote-tracking branch 'origin/master' into f14

[Hans de Goede]

commit 3fb46845a252bbc232b308094799e616618b1e98
Merge: 51da082 326117c
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Jul 28 16:01:28 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	quake3.spec
    	sources
    	urbanterror.sh
    	worldofpadman.sh

 .gitignore                                         |    1 +
 ...0-don-t-require-BASEGAME-pak0.pk3-if-fs_b.patch |   35 ---
 ...seAccelOffset-at-0.001-to-avoid-division-.patch |   49 ----
 ...eRead-allow-loading-any-demo-not-just-the.patch |   56 -----
 ...col-cvar-to-be-changed-on-the-command-lin.patch |  119 ----------
 ...using-the-protocol-version-from-the-comma.patch |   71 ------
 ...al-vmMagic-that-causes-equivalent-native-.patch |   68 ------
 ...new-function-to-go-through-the-search-pat.patch |   64 ------
 0010-Sys_LoadDll-use-FS_FindDll.patch              |   87 -------
 0013-Double-the-default-com_hunkMegs-to-128M.patch |   27 ---
 quake3-1.34-fix-empty-fs_game-from-server.patch    |   15 --
 quake3-1.34-rc4-demo-pak.patch                     |   31 +--
 quake3-1.36-syslibs.patch                          |  238 ++------------------
 quake3.spec                                        |  114 ++++------
 sources                                            |    2 +-
 urbanterror.autodlrc                               |   11 +-
 urbanterror.sh                                     |   33 ++--
 worldofpadman.autodlrc                             |   22 +--
 worldofpadman.sh                                   |   56 +++---
 19 files changed, 135 insertions(+), 964 deletions(-)
---