Arthur Ice ea2a1651d5 Merge branch 'master' into StringFormatting ...

Conflicts:
	common/debug.cpp

2013-05-22 18:07:39 -07:00

..

Client62_itemfields.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

Client62_ops.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

Client62_structs.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

Client62.cpp

Merge branch 'master' into StringFormatting

2013-05-22 18:07:39 -07:00

Client62.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

makepatch

svn -> git Migration

2013-02-16 16:14:39 -08:00

patches.cpp

svn -> git Migration

2013-02-16 16:14:39 -08:00

patches.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

RoF_itemfields.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

RoF_ops.h

Resurrection - Fix for RoF + fixed a couple of memory leaks.

2013-03-15 19:37:29 +00:00

RoF_structs.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

RoF.cpp

Merge branch 'master' into StringFormatting

2013-05-22 18:07:39 -07:00

RoF.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

SoD_itemfields.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

SoD_ops.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

SoD_structs.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

SoD.cpp

Merge branch 'master' into StringFormatting

2013-05-22 18:07:39 -07:00

SoD.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

SoF_itemfields.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

SoF_opcode_list.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

SoF_ops.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

SoF_structs.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

SoF.cpp

Merge branch 'master' into StringFormatting

2013-05-22 18:07:39 -07:00

SoF.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

SSDeclare.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

SSDefine.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

SSRegister.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

template_ops.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

template_structs.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

template.cpp

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

template.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

Titanium_itemfields.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

Titanium_ops.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

Titanium_structs.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

Titanium.cpp

Merge branch 'master' into StringFormatting

2013-05-22 18:07:39 -07:00

Titanium.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

Underfoot_itemfields.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

Underfoot_ops.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

Underfoot_structs.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

Underfoot.cpp

Merge branch 'master' into StringFormatting

2013-05-22 18:07:39 -07:00

Underfoot.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00