diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 22:42:47 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 22:42:47 +0200 |
| commit | 4bdedcb878dda3d657339cea3f4b3d1efba96631 (patch) | |
| tree | bed72437b32381f34e95741cf8f971e2b1bd1c3c /contrib | |
| parent | 2433a184ca82fb34a90bc19c43590900434f218e (diff) | |
| parent | 1c1f4fe33d75ca00fa6fd3370ff0f13731523f14 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/merge_updates_windows.bat | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/merge_updates_windows.bat b/contrib/merge_updates_windows.bat index 96fafb817ba..c43d4adf907 100644 --- a/contrib/merge_updates_windows.bat +++ b/contrib/merge_updates_windows.bat @@ -1,2 +1 @@ copy /a ..\sql\updates\world\*.sql /b world_updates.sql -copy /a ..\sql\updates\auth\*.sql /b auth_updates.sql
\ No newline at end of file |