Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

This commit is contained in:
Zack Piispanen 2012-04-27 00:48:53 -04:00
commit c27dfddaaa
66 changed files with 82 additions and 70 deletions

View file

@ -1,6 +1,6 @@
/*
TShock, a server mod for Terraria
Copyright (C) 2011 The TShock Team
Copyright (C) 2011-2012 The TShock Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by