[b]11774[/b]
-conflicts resolved

[b]11714[/b]
-conflicts resolved
-moved code around (from variables.h into copypaste/commandqueue...)
-removed many (now) unneeded header-includes

[b]11703[/b]
-conflicts resolved

[b]11642 + 0.6.0-beta2[/b]
-feature: CTRL+X stops pasting in multiplayer

[b]11625 + 0.6.0-beta2[/b]
-copy/paste shortcuts work again. (Thx 7of9 for reporting)

[b]0.6.0-beta2[/b]
-files added

[b]11600[/b]
-gui codechange adaption
-some code-cleanup around gui-widgets

[b]11537[/b]
-conflicts resolved

[b]11482 + 0.6.0-beta1[/b]
-updated patchfiles

[b]11474 + 0.6.0-beta1[/b]
-some conflicts resolved
-0.6.0-beta1 files added

[b]11422[/b]
-some conflicts resolved
-copypaste grf's are loading again. unlike the openttd graphics they are still unchangable via newgrf

[b]11388[/b]
-some conflicts resolved

[b]11248[/b]
-road/tram bridges and tunnels work again

[b]11231[/b]
-some conflicts resolved

[b]11133[/b]
-same as for 0.5.3: CMD_AUTO stuff
One way roads still not implemented, because i need more bits to store the extra info.
This would break the template-files.
Time to think about proper template-file-versioning like ottd savegames...

[b]0.5.3[/b]
-files updated (CMD_AUTO stuff)

[b]0.5.3-rc3[/b]
-files added

[b]10957[/b]
-minor patching conflict

[b]10791[/b]
-minor patching conflict

[b]10649 + 0.5.3-rc2[/b]
-minor patching conflict

[b]10450[/b]
-updated to 10450 to include signal-auto-completion

[b]10429 + 0.5.2[/b]
-new feature: Disable terrain recreation
-added button to copypaste.grf
May be useful for pasting a station entrance along a hillside.
Only use with tunnels if you know what you are doing...

[b]0.5.2[/b]
-bugfix: copy road/rails below bridges again. thx Starbud

[b]10369[/b]
-applies against trunk again

[b]10314[/b]
-started comment style conversion
-started adding TODO's for code shortening/simplification

[b]10306[/b]
-forgot to "generate" project files for msvc users

[b]10304[/b]
-applies against trunk again (changed SLError paramtype)

[b]10263[/b]
-applies against trunk again
-fixed color problem in copypaste.grf

[b]10040[/b]
-fixed road/tram rotation+mirroring
-applies against trunk again
-TODO: allow c&p for different signaltypes/form on one tile

[b]0.5.2[/b]
-added 0.5.2 source-patch
-added 0.5.2 Package

[b]9959[/b]
-feature add: trams supported (track+depot+crossings).
-switched from rar to 7zip for win32-executables

[b]9840[/b]
-updated patchfile: minor patching conflicts.

[b]9790[/b]
-updated patchfile: minor patching conflicts.

[b]9712[/b]
-updated patchfile: minor patching conflicts.

[b]0.5.1[/b]
-added 0.5.1 source-patch
-added 0.5.1 Package

[b]0.5.1_rc3[/b]
-added 0.5.1-rc3 source-patch
-added 0.5.1-rc3 Package

[b]0.5.1_rc2[/b]
-added 0.5.1-rc2 source-patch
-added 0.5.1-rc2 Package
-bridge length bug fixed

[b]9619[/b]
-updated patchfile: minor patching conflicts. (NS flag was removed)

[b]9576[/b]
-updated patchfile: minor patching conflicts.

[b]9395[/b]
-updated patchfile: minor patching conflicts.

[b]0.5.0[/b]
-added 0.5.0 source-patch
-added 0.5.0 Package

[b]9228[/b]
-updated patchfile: newhouses merge + fixed crash on waypoint copy

[b]9128[/b]
-updated patchfile: minor patching conflicts.

[b]9026[/b]
-updated patchfile: minor patching conflicts.

[b]8947[/b]
-updated patchfile: GetRailTypeCrossing -> GetRailtype
Note: the operator definitions for enums (<< and >>) were completely removed. This may result in warnings in your compiler.

[b]8848[/b]
-updated patchfile: uintswap()->Swap()

[b]8604[/b]
-updated for trunk

[b]8419[/b]
-added operator << for enum+unsigned int to silence compiler warnings

[b]8280[/b]
-same as revision before ;)

[b]8275[/b]
-updated patchfile for changed CmdBuildSingleSignals (pasting semaphores will work again)

[b]8230[/b]
-changing pastespeed did not work (a change got lost somehow)

[b]8178[/b]
-small bridge bug fixed (bridge over bridgeramp)
-synced with trunk (spritelimit stuff)

[b]8048[/b]
-updated patchfile: cpp-branch merge

[b]7865[/b]
-updated patchfile: makefile-rewrite merge

[b]7592[/b]
-added ctrl+insert shortcut (copy)
-added shift+insert shortcut (paste)
-added serverside option: paste-speed. determines the speed a layout is pasted in network games.
-apply against trunk again (bridge-branch merge)

[b]7493[/b]
-apply against trunk again (_path -> _paths)

[b]7408[/b]
-apply against trunk again

[b]7318[/b]
-filesystem stuff changed in trunk

[b]7236[/b]
-added missing .ch files to patchfile. (thx DannyA)

[b]7203[/b]
-apply against trunk again

[b]7144[/b]
-apply against trunk again
-save/load template dialog captions added
-copy&paste tooltip fixed (thx mart3p)
-template saving works again (thx DannyA) (#2)