summaryrefslogtreecommitdiffstats
path: root/src/AllocationPool.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Temporarily commented out override directives."Tycho2014-09-051-2/+2
| | | | | | | | | | | | | | | This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64. Conflicts: src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/Generating/ChunkGenerator.h src/LoggerListeners.cpp src/Mobs/Components/AIAggressiveComponent.h src/Mobs/Monster.h src/OSSupport/IsThread.h src/Protocol/Authenticator.h src/UI/SlotArea.h
* Merge branch 'master' into ComponentRewriteTycho2014-09-051-2/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/LoggerListeners.cpp src/Mobs/Monster.cpp src/UI/SlotArea.h
| * Final template keyword style fix.Mattes D2014-08-281-2/+2
| |
* | Temporarily commented out override directives.Samuel Barney2014-08-211-2/+2
|/
* Fixed basic whitespace problems.madmaxoft2014-07-171-2/+6
| | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
* Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-0/+109
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 00:29:23 +0200