Commit graph

7 commits

Author SHA1 Message Date
Lucas Nicodemus
1c7d71431f Merge branch 'master' into general-devel
Conflicts:
	DBEditor/TShockDBEditor.csproj
2011-07-23 17:30:20 -06:00
Lucas Nicodemus
81ef1b6cff Test 2011-07-23 17:29:12 -06:00
high
7f5324795c Merge branch 'master' of github.com:TShock/TShock 2011-07-22 23:12:20 -04:00
high
3034e82d4e Mysql binaries now copy local when tshock/dbeditor are built. 2011-07-22 23:11:58 -04:00
Steven French
fcde754784 Adds new permissions to DBEditor 2011-07-23 14:56:17 +12:00
high
de5ce1a962 Moved sql and terrariaserver binaries
Fixed DBEditor reference
2011-07-22 22:49:54 -04:00
Steven French
ca9c5a5d4a Adds DBEditor to Master Project
DBEditor can now add new groups
2011-07-23 14:41:03 +12:00