commit d799588cb88dae6c80cef9ee3a24f14f5947bc83 Merge: 56f4c33 9d93a6a Author: fonsinchen Date: Thu May 26 14:14:47 2011 +0200 Merge branch 'station-gui' into cd-tmp commit 56f4c33dc61b821740bb5af12910445e12f5cb9f Merge: a251a2c 795da65 Author: fonsinchen Date: Thu May 26 14:14:47 2011 +0200 Merge branch 'ext-rating' into cd-tmp commit a251a2c30c3a5c107239f324783d4cc22c056a7a Merge: 6bd4f54 ad2b93e Author: fonsinchen Date: Thu May 26 14:14:47 2011 +0200 Merge branch 'smallmap-overlay' into cd-tmp commit 6bd4f54632dfdd6dc6bb646bfb987eb17bef8fa1 Merge: acb9188 f0907aa Author: fonsinchen Date: Thu May 26 14:14:47 2011 +0200 Merge branch 'viewport-overlay' into cd-tmp commit ad2b93e24d38a160f456c6223c3084f0a79f7cff Merge: 68344b3 6c67682 Author: fonsinchen Date: Thu May 26 14:14:46 2011 +0200 Merge branch 'smallmap-overlay-tmp' into smallmap-overlay commit 6c67682b01d8143e6f786b46e54b7cb8b196defb Merge: a10e55c 96989db Author: fonsinchen Date: Thu May 26 14:14:46 2011 +0200 Merge branch 'smallmap-refactor' into smallmap-overlay-tmp commit a10e55c5698ca5d88e08b4a35bd1df500636a965 Merge: f72d71e 4cca01e Author: fonsinchen Date: Thu May 26 14:14:46 2011 +0200 Merge branch 'linkgraph-overlay' into smallmap-overlay-tmp commit f0907aa21b396370b1b23646f76e2d91a0c80848 Merge: 8a6c97d f265c53 Author: fonsinchen Date: Thu May 26 14:14:45 2011 +0200 Merge branch 'viewport-overlay-tmp' into viewport-overlay commit 96989db8ea08a598528f439c2f7adacc025c031d Merge: d6b8418 2f94d8c Author: fonsinchen Date: Thu May 26 14:14:45 2011 +0200 Merge branch 'smallmap-refactor-tmp' into smallmap-refactor commit 4cca01e052ddb1794c397ef4be5d70d568423efb Merge: 82a7e82 596f598 Author: fonsinchen Date: Thu May 26 14:14:44 2011 +0200 Merge branch 'linkgraph-overlay-tmp' into linkgraph-overlay commit f265c53fd8eedb41a2154f494f824ae78b1979f1 Merge: d664df9 4cca01e Author: fonsinchen Date: Thu May 26 14:14:44 2011 +0200 Merge branch 'overlay-legend-tmp' into overlay-legend commit 795da658097c3d922eab273be8ff28eb592ccd29 Merge: 9e7bd05 596f598 Author: fonsinchen Date: Thu May 26 14:14:42 2011 +0200 Merge branch 'ext-rating-tmp' into ext-rating commit 9d93a6a5d73d358c565ce8a615a0cbad242b3228 Merge: 3b92db5 596f598 Author: fonsinchen Date: Thu May 26 14:14:40 2011 +0200 Merge branch 'station-gui-tmp' into station-gui commit 596f598cc2654f610c88f01c7f9603b86b17a09d Merge: b4b2265 2e69901 Author: fonsinchen Date: Thu May 26 14:14:39 2011 +0200 Merge branch 'cargomap-tmp' into cargomap commit 2e69901720e4e1f9b3965a2bd26da9aa374eab96 Merge: a6ffbf3 ef4a79f Author: fonsinchen Date: Thu May 26 14:14:38 2011 +0200 Merge branch 'selfaware-stationcargo' into cargomap-tmp commit a6ffbf3e7faf7500388f96f5e15dcea21fd8af4a Merge: 7c4fead c6e3aa8 Author: fonsinchen Date: Thu May 26 14:14:38 2011 +0200 Merge branch 'reservation' into cargomap-tmp commit 7c4fead80cc745926e7dba84f03a972930c0adfa Merge: abc3c7e 101b4df Author: fonsinchen Date: Thu May 26 14:14:38 2011 +0200 Merge branch 'multimap' into cargomap-tmp commit abc3c7e474c5fb7ebcbecef825dd90a5d0b3c984 Merge: 3b70d66 9117e75 Author: fonsinchen Date: Thu May 26 14:14:38 2011 +0200 Merge branch 'texteff' into cargomap-tmp commit 3b70d66cb5dd11414b341452b36f2353d8f2c32c Merge: e2b34a6 67520a4 Author: fonsinchen Date: Thu May 26 14:14:38 2011 +0200 Merge branch 'flowmapping-core' into cargomap-tmp commit ef4a79fa3987e1f20ca344f5160dd849637dcf05 Merge: 673d0ef 2f94d8c Author: fonsinchen Date: Thu May 26 14:14:37 2011 +0200 Merge branch 'selfaware-stationcargo-tmp' into selfaware-stationcargo commit c6e3aa884554bf0ae4f2587d28b54df17eff1153 Merge: 30cb2d4 6f45d2a Author: fonsinchen Date: Thu May 26 14:14:37 2011 +0200 Merge branch 'reservation-tmp' into reservation commit 101b4df638ea1fc30d4162d484641361b33cf7ff Merge: 3641efd 2f94d8c Author: fonsinchen Date: Thu May 26 14:14:36 2011 +0200 Merge branch 'multimap-tmp' into multimap commit 6f45d2a7f26d4c113e6ab5850a841a97acd71f41 Merge: 70bfd15 2f94d8c Author: fonsinchen Date: Thu May 26 14:14:36 2011 +0200 Merge branch 'gitmake' into reservation-tmp commit 9117e759c824ffc814c93275f5dbfbdf2f44457b Merge: dca7a9b 2f94d8c Author: fonsinchen Date: Thu May 26 14:14:35 2011 +0200 Merge branch 'texteff-tmp' into texteff commit 67520a4e7830038b446a6b1f06d1758c39d8f655 Merge: f2c3ef7 fd763f8 Author: fonsinchen Date: Thu May 26 14:14:34 2011 +0200 Merge branch 'flowmapping-core-tmp' into flowmapping-core commit fd763f88dca9fed69670625694712db0187cafb5 Merge: cb2236a 02dc54c Author: fonsinchen Date: Thu May 26 14:14:34 2011 +0200 Merge branch 'mcf-tmp' into mcf commit 02dc54cabc48433058dae1139301e1206cf331c5 Merge: d86b969 b4c0237 Author: fonsinchen Date: Thu May 26 14:14:33 2011 +0200 Merge branch 'demands-tmp' into demands commit b4c0237ed0ab6a731a94ee63cf4bced865f2e432 Merge: 78dafcc 57d8845 Author: fonsinchen Date: Thu May 26 14:14:32 2011 +0200 Merge branch 'components-tmp' into components commit 57d88457d9cd7346da894349ad516cdcf3938da4 Merge: 899b26c 4f60fa8 Author: fonsinchen Date: Thu May 26 14:14:31 2011 +0200 Merge branch 'capacities-tmp' into capacities commit 4f60fa85fbfd889b6cbaaeb77bca834a1863630b Merge: a2cd075 17c05f7 Author: fonsinchen Date: Thu May 26 14:14:31 2011 +0200 Merge branch 'moving-average' into capacities-tmp commit 2f94d8cd7564bfb79d0e7849f4242c4c1cf7265b Merge: d5f143a 5108896 Author: fonsinchen Date: Thu May 26 14:14:30 2011 +0200 Merge branch 'master' into gitmake commit 17c05f7a04edefd9135cbe3d3281aa8736a4b969 Merge: 3522a69 08c3003 Author: fonsinchen Date: Thu May 26 14:14:30 2011 +0200 Merge branch 'moving-average-tmp' into moving-average commit 08c3003ac60849c1c51bf14b5e961675e12f5ee8 Merge: 6ce78bf 2f94d8c Author: fonsinchen Date: Thu May 26 14:14:30 2011 +0200 Merge branch 'gitmake' into moving-average-tmp commit 510889636245e39e93867db583d98003fb32dd0d Author: frosch Date: Wed May 25 20:10:02 2011 +0000 (svn r22492) -Fix [FS#4624] (r21642, r22328): Only try to insert implicit orders for ground vehicles. Aircraft may reach unscheduled terminals when skippnig orders etc. commit c52c0764f3ec4128a70433efe2b8fc004dfea230 Author: terkhen Date: Wed May 25 16:40:30 2011 +0000 (svn r22491) -Fix [FS#4623]: [Windows] Generate crashlogs correctly in binaries created with MinGW-w64. (JGR) commit c30ff054f6221671f9c2f438fd15181ba159cc1e Author: terkhen Date: Wed May 25 16:35:23 2011 +0000 (svn r22490) -Fix [FS#4623]: [Squirrel] Fix compilation under MinGW-w64. (JGR) commit 9d8896bb8caf11cd8a3f5b1fb1a73643d8f3fdc8 Author: rubidium Date: Sun May 22 21:40:26 2011 +0000 (svn r22489) -Fix [FS#4623]: don't cast pointers to unsigned long or vice versa commit 7849495f6a287edc6034a5ee900de877403c9cf8 Author: alberth Date: Sun May 22 20:18:38 2011 +0000 (svn r22488) -Doc: Add Doxygen comments to screenshot code. commit c779ee6b58b7de757a8da813fc69af2438b199a4 Author: smatz Date: Sun May 22 19:18:28 2011 +0000 (svn r22487) -Fix (r15216)[FS#4622]: engine IDs for coal and mail wagons were swapped commit 53039feaec74d0544340dd134c16928c96359b01 Author: translators Date: Sun May 22 17:45:06 2011 +0000 (svn r22486) -Update from WebTranslator v3.0: dutch - 11 changes by Parody commit da43dd69a4d4253fa0d0893ca04a4d6f32959a5b Author: frosch Date: Sat May 21 22:23:13 2011 +0000 (svn r22485) -Fix: EnsureVisibleCaption() did not update viewport positions of windows with viewports but without caption. (only triggerable since r22484) commit 55041d1c172d1baea8e7ef191375f57e03d58785 Author: frosch Date: Sat May 21 22:22:02 2011 +0000 (svn r22484) -Fix: The caption of centered windows could be moved out of the main window and thus become inaccessible when resizing the main window. commit a848bd2c29d8270ad9bb573776a7f4e1d1210b4b Author: translators Date: Sat May 21 17:45:06 2011 +0000 (svn r22483) -Update from WebTranslator v3.0: dutch - 2 changes by Parody commit 62b6d0eb0eb08c4b1fc32e76d6ac6a7f14e56746 Author: frosch Date: Sat May 21 11:26:37 2011 +0000 (svn r22482) -Codechange: Add some contants for the number of ticks between certain cyclical tasks. commit f761b7249c54cffacf057bb6703aba79da3fd5a0 Author: smatz Date: Sat May 21 08:40:50 2011 +0000 (svn r22481) -Fix: compilation with recent GCC commit d7f9aaff5ac1ffb3345e32775a77805c993e6d2a Author: translators Date: Fri May 20 17:45:09 2011 +0000 (svn r22480) -Update from WebTranslator v3.0: hungarian - 5 changes by IPG spanish - 1 changes by Terkhen