diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /vcproj-12/char-server.vcxproj | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'vcproj-12/char-server.vcxproj')
| -rw-r--r-- | vcproj-12/char-server.vcxproj | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj index d281c2961..973d9d781 100644 --- a/vcproj-12/char-server.vcxproj +++ b/vcproj-12/char-server.vcxproj @@ -162,6 +162,7 @@ <ClInclude Include="..\src\common\timer.h" /> <ClInclude Include="..\src\common\utils.h" /> <ClInclude Include="..\src\char\char.h" /> + <ClInclude Include="..\src\char\HPMchar.h" /> <ClInclude Include="..\src\char\int_auction.h" /> <ClInclude Include="..\src\char\int_elemental.h" /> <ClInclude Include="..\src\char\int_guild.h" /> @@ -203,6 +204,7 @@ <ClCompile Include="..\src\common\timer.c" /> <ClCompile Include="..\src\common\utils.c" /> <ClCompile Include="..\src\char\char.c" /> + <ClCompile Include="..\src\char\HPMchar.c" /> <ClCompile Include="..\src\char\int_auction.c" /> <ClCompile Include="..\src\char\int_elemental.c" /> <ClCompile Include="..\src\char\int_guild.c" /> |