Upstream merge.

This commit is contained in:
md_5 2015-01-05 14:32:01 +11:00 committed by Zach Brown
parent 6ae735e2e3
commit 384699a51a
188 changed files with 247 additions and 253 deletions

View file

@ -1,4 +1,4 @@
From 4a69eee241ad670d823f4157fb9ce2071892f265 Mon Sep 17 00:00:00 2001
From cc59d3746763657df3c19c89fe06739fd5266c46 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:01:32 +0200
Subject: [PATCH] Add PlayerSpawnLocationEvent.