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-9/char-server.vcproj | |
| 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-9/char-server.vcproj')
| -rw-r--r-- | vcproj-9/char-server.vcproj | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vcproj-9/char-server.vcproj b/vcproj-9/char-server.vcproj index 129a9b074..a532db231 100644 --- a/vcproj-9/char-server.vcproj +++ b/vcproj-9/char-server.vcproj @@ -453,6 +453,14 @@ > </File> <File + RelativePath="..\src\char\HPMchar.c" + > + </File> + <File + RelativePath="..\src\char\HPMchar.h" + > + </File> + <File RelativePath="..\src\char\int_auction.c" > </File> |