diff options
| author | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-05 17:08:29 -0800 |
|---|---|---|
| committer | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-05 17:08:29 -0800 |
| commit | 5e76d9a1a0ab36af5d8ad072ea4dcbf6122b0ae9 (patch) | |
| tree | a938a98c1d3b856dd37cc989ac0d39d2de58abe1 /.gitignore | |
| parent | 9909d3bf4f4ad0acad48fbe5f1cfe69e44109da9 (diff) | |
| parent | 2eb3e450d53a450d2493fae0ede3632802de6dd6 (diff) | |
| download | hercules-5e76d9a1a0ab36af5d8ad072ea4dcbf6122b0ae9.tar.gz hercules-5e76d9a1a0ab36af5d8ad072ea4dcbf6122b0ae9.tar.bz2 hercules-5e76d9a1a0ab36af5d8ad072ea4dcbf6122b0ae9.tar.xz hercules-5e76d9a1a0ab36af5d8ad072ea4dcbf6122b0ae9.zip | |
Merge pull request #2 from HerculesWS/master
Merging Hercules Commits from Feb 3 - 5 2013.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 49 |
1 files changed, 7 insertions, 42 deletions
diff --git a/.gitignore b/.gitignore index 5eb3969ca..447365f22 100644 --- a/.gitignore +++ b/.gitignore @@ -23,9 +23,6 @@ /Makefile.cache /map-server_sql /mapcache -/rAthena - -# /3rdparty/cmake/ # /3rdparty/libconfig/ /3rdparty/libconfig/Makefile @@ -42,35 +39,6 @@ /log/*.log /log/map-server_sql.leaks -# /npc/airports/ - -# /npc/cities/ - -# /npc/jobs/ - -# /npc/kafras/ - -# /npc/merchants/ - -# /npc/mobs/ - -# /npc/other/ - -# /npc/quests/ - -# /npc/re/quests/eden/ -/npc/re/quests/eden/55-70.txt - -# /npc/warps/ - -# /npc/warps/cities/ - -# /npc/warps/dungeons/ - -# /npc/warps/fields/ - -# /npc/warps/other/ - # /src/char/ /src/char/Makefile /src/char/obj_sql @@ -86,16 +54,12 @@ /src/login/obj_txt /src/login/obj_sql -# /src/login/sql/ - # /src/map/ /src/map/Makefile /src/map/obj_sql /src/map/obj_txt /src/map/pcre.h -# /src/map/sql/ - # /src/test/ /src/test/Makefile /src/test/obj @@ -111,13 +75,18 @@ /tools/*.ilk /tools/*.pdb +# /vcproj-12/ +/vcproj-12/char-server_sql +/vcproj-12/login-server_sql +/vcproj-12/mapcache +/vcproj-12/map-server_sql +/vcproj-12/*.user + # /vcproj-10/ /vcproj-10/char-server_sql /vcproj-10/login-server_sql /vcproj-10/mapcache /vcproj-10/map-server_sql -/vcproj-10/txt-converter-char -/vcproj-10/txt-converter-login /vcproj-10/*.user # /vcproj-9/ @@ -126,7 +95,3 @@ /vcproj-9/login-server_sql /vcproj-9/map-server_sql /vcproj-9/mapcache -/vcproj-9/plugin-console -/vcproj-9/plugin-pid -/vcproj-9/txt-converter-char -/vcproj-9/txt-converter-login |