Akkadius 3d74035e24 Merge remote-tracking branch 'remotes/origin/master' into logging_changes ...

Conflicts:
	zone/command.cpp
	zone/command.h
	zone/inventory.cpp

2015-01-21 16:40:46 -06:00

..

defaults

Update LS default entry in example config

2014-06-05 02:57:56 -04:00

deprecated

Remove commented printf : Used up to slot %d of %d in links\n

2015-01-20 01:35:04 -06:00

EQExtractor2

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

patches

(RoF2) Guild invites now add new members as members instead of recruits, and /guild chat works properly.

2015-01-13 23:37:35 -06:00

scripts

Added host parameter for folks using different hosts cause one is not enough

2015-01-11 19:13:38 -06:00

sql

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 16:40:46 -06:00

TaskMaster

Remove trailing whitespace

2013-05-09 11:13:16 -04:00