Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source

Conflicts:
	changelog.txt

...

This commit is contained in:

SecretsOTheP

2014-09-02 21:18:30 -04:00

parent 832e5e90d1 7ddaabee30

commit 7301182b3e

7 changed files with 17 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

utils/sql/git/queryserv/required/Complete_QueryServ_Rules_Disabled.sql → utils/sql/git/optional/2014_08_23_Complete_QueryServ_Rules_Disabled.sql

utils/sql/git/queryserv/required/Complete_QueryServ_Rules_Enabled.sql → utils/sql/git/optional/2014_08_23_Complete_QueryServ_Rules_Enabled.sql

utils/sql/git/queryserv/required/Complete_QueryServ_Table_Structures.sql → utils/sql/git/required/2014_08_23_Complete_QueryServ_Table_Structures.sql

utils/sql/git/queryserv/required/08_23_2014_player_events_and_player_aa_rate_hourly.sql → utils/sql/git/required/2014_08_23_player_events_and_player_aa_rate_hourly.sql