diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-07-07 20:36:00 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-07-07 20:36:00 -0300 |
| commit | 6967b9e0b63d19141d4f59b7933a960ac81916d0 (patch) | |
| tree | 8ecd9cd2461f3598cb7faece71eb77162aa4ef2a /.gitignore | |
| parent | 9877fd4ad81120af8e63e96d5d429092014dc017 (diff) | |
| parent | 046c659193e1ca8bd13478678d1277df8bf9395c (diff) | |
| download | serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.gz serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.bz2 serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.xz serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.zip | |
Merge branch 'master' into legacy
Override all files with 'master' version.
This version is meant to preserve git history as requested by bjorn.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 131 |
1 files changed, 126 insertions, 5 deletions
@@ -1,5 +1,126 @@ -# Server files -log/ -gm.log.* -online.* -/converter.txt +#Global +.Apple* +.DS_Store +._* +.clang_complete +.local.vimrc +.ycm_extra_conf.py* +Thumbs.db + +# / +/*.exe +/*.ilk +/*.log +/*.ncb +/*.opensdf +/*.opt +/*.pdb +/*.pid +/*.sdf +/*.stackdump +/*.suo +/*.exp +/*.lib +/autom4te.cache/ +/start-log.txt +/char-server +/config.log +/config.status +/core +/ipch +/login-server +/Makefile.cache +/map-server +/mapcache +/configure +/versions + +# /plugins -- everything +/plugins/ + +#OSX Xcode project user-sensitive-stuff +/DerivedData +/Hercules +/build +/Hercules.xcodeproj/xcuserdata +/Hercules.xcodeproj/project.xcworkspace/xcuserdata/ +/Hercules.xcodeproj/project.xcworkspace/xcshareddata/Hercules.xccheckout + +# /3rdparty/libconfig/ +/3rdparty/libconfig/Makefile +/3rdparty/libconfig/*.o + +# /3rdparty/mt19937ar/ +/3rdparty/mt19937ar/Makefile +/3rdparty/mt19937ar/*.o + +# /cache/ +/cache/ + +# /conf/ +/conf/import + +# /log/ +/log/*.log +/log/*.leaks +/log/*.tmp + +# /src/char/ +/src/char/Makefile +/src/char/obj_sql + +# /src/common/ +/src/common/Makefile +/src/common/obj_all +/src/common/obj_sql +/src/common/sysinfo.inc + +# /src/login/ +/src/login/Makefile +/src/login/obj_sql + +# /src/map/ +/src/map/Makefile +/src/map/obj_sql +/src/map/pcre.h + +# /src/test/ +/src/test/Makefile +/src/test/obj + +# /src/tool/ +/src/tool/Makefile +/src/tool/obj_all + +# /src/plugins/ +/src/plugins/Makefile + +# /tools/ +/tools/convert +/tools/adduser +/tools/*.exe +/tools/*.ilk +/tools/*.pdb +/tools/HPMHookGen/Makefile +/tools/HPMHookGen/doxyoutput + +# /vcproj-* +/vcproj-*/*.user +/vcproj-*/char-server +/vcproj-*/login-server +/vcproj-*/map-server +/vcproj-*/mapcache +/vcproj-*/plugin-*/ + +# temp files +*.txt~ +*.conf~ +*.py~ +*.bak +/gmon.out +/gprof_* + +# auto created configs +conf/channels.conf +npc/commands/motd-debug-text.txt +*.diff |