|
glx
|
r8760:145188dd8625
|
16 years ago
|
|
|
|
miham
|
r8688:c9b7986bdc61
|
16 years ago
|
|
(svn r12361) -Update: WebTranslator2 update to 2008-03-12 09:46:45 brazilian_portuguese - 2 fixed by fukumori (2) bulgarian - 3 fixed, 1 changed by kokobongo (3), thetitan (1) catalan - 2 fixed by arnaullv (2) czech - 2 fixed by Hadez (2) danish - 15 fixed by ThomasA (15) dutch - 2 fixed, 1 changed by habell (3) estonian - 2 fixed by kristjans (2) french - 2 fixed by glx (2) german - 15 fixed, 1 changed by moewe2 (16) italian - 2 fixed by lorenzodv (2) portuguese - 9 fixed, 6 changed by nars (15) slovak - 2 fixed by lengyel (2) slovenian - 9 fixed by Necrolyte (9) spanish - 2 fixed, 2 changed by eusebio (4) turkish - 22 fixed by jnmbk (22) ukrainian - 2 fixed, 18 changed by mad (20)
|
|
smatz
|
r8552:cdfa1b3892bf
|
16 years ago
|
|
|
|
maedhros
|
r8425:f83f168ebdb7
|
16 years ago
|
|
|
|
peter1138
|
r8421:2756461dc9e0
|
16 years ago
|
|
|
|
glx
|
r8357:d651090d8a1c
|
17 years ago
|
|
|
|
peter1138
|
r8328:eb174646950b
|
17 years ago
|
|
|
|
rubidium
|
r8227:553c3397a81b
|
17 years ago
|
|
|
|
miham
|
r8167:8b29e48b21bd
|
17 years ago
|
|
(svn r11730) -Update: WebTranslator2 update to 2007-12-31 19:55:44 catalan - 1 fixed by arnaullv (1) dutch - 1 fixed by webfreakz (1) estonian - 1 fixed by kristjans (1) french - 1 fixed by glx (1) german - 27 fixed by moewe2 (27) hungarian - 21 fixed by miham (21) italian - 1 fixed by lorenzodv (1) japanese - 1 fixed by ickoonite (1) korean - 1 fixed by leejaeuk5 (1) norwegian_bokmal - 23 fixed by jhsoby (23) polish - 2 fixed by meush (2) portuguese - 96 fixed, 7 changed by nars (103) slovak - 1 fixed by lengyel (1) spanish - 12 fixed by eusebio (12) swedish - 13 fixed by ChrillDeVille (13) turkish - 14 fixed by jnmbk (14)
|
|
miham
|
r8067:4e085739927f
|
17 years ago
|
|
(svn r11628) -Update: WebTranslator2 update to 2007-12-13 09:47:23 american - 30 fixed by WhiteRabbit (30) brazilian_portuguese - 22 fixed by fukumori (9), tucalipe (13) bulgarian - 8 fixed by thetitan (8) catalan - 22 fixed by arnaullv (22) croatian - 17 fixed by knovak (17) czech - 22 fixed by Hadez (22) danish - 1 fixed, 4 changed by Bjarni (5) dutch - 22 fixed by habell (22) estonian - 10 fixed by kristjans (10) french - 7 fixed, 2 changed by glx (9) italian - 7 fixed, 2 changed by lorenzodv (9) japanese - 23 fixed by ickoonite (23) korean - 33 fixed, 7 changed by leejaeuk5 (40) norwegian_nynorsk - 9 fixed by pollux (9) romanian - 13 fixed, 3 changed by CrystyB (16) slovak - 22 fixed by lengyel (22) slovenian - 22 fixed by Necrolyte (22) swedish - 10 fixed by daishan (10) turkish - 20 fixed by jnmbk (20) ukrainian - 22 fixed by mad (22)
|
|
rubidium
|
r7998:ab0b3551471d
|
17 years ago
|
|
|
|
miham
|
r7938:3d092890cc1c
|
17 years ago
|
|
(svn r11491) -Update: WebTranslator2 update to 2007-11-22 20:55:02 brazilian_portuguese - 5 fixed by tucalipe (5) catalan - 5 fixed by arnaullv (5) czech - 5 fixed by Hadez (5) danish - 6 fixed, 3 changed by MiR (9) dutch - 5 fixed by habell (5) french - 5 fixed by glx (5) italian - 2 fixed by lorenzodv (2) japanese - 5 fixed by ickoonite (5) korean - 58 fixed by leejaeuk5 (58) slovak - 5 fixed, 86 changed by lengyel (91) slovenian - 5 fixed by Necrolyte (5) spanish - 5 fixed by eusebio (5) swedish - 5 fixed by daishan (5) turkish - 5 fixed by jnmbk (5)
|
|
rubidium
|
r7884:b151663db796
|
17 years ago
|
|
|
|
rubidium
|
r7870:a6b72431f9cd
|
17 years ago
|
|
|
|
miham
|
r7836:6b3bef040abc
|
17 years ago
|
|
(svn r11386) -Update: WebTranslator2 update to 2007-11-05 19:07:09 afrikaans - 24 changed by TrueTenacity (24) brazilian_portuguese - 1 fixed by tucalipe (1) czech - 1 fixed by Hadez (1) dutch - 1 fixed by habell (1) norwegian_bokmal - 4 fixed, 43 changed by jhsoby (47) turkish - 28 fixed by jnmbk (28)
|
|
miham
|
r7715:c3370700c259
|
17 years ago
|
|
(svn r11249) -Update: WebTranslator2 update to 2007-10-12 22:42:24 afrikaans - 110 fixed, 141 changed by TrueTenacity (251) catalan - 1 fixed by arnaullv (1) czech - 1 fixed by Hadez (1) french - 1 fixed by glx (1) slovak - 1 fixed by lengyel (1) slovenian - 1 fixed by Necrolyte (1) spanish - 1 fixed by eusebio (1) turkish - 11 fixed by jnmbk (11) ukrainian - 3 fixed by mad (3)
|
|
rubidium
|
r7682:35be8742360b
|
17 years ago
|
|
|
|
miham
|
r7611:10282a19ab63
|
17 years ago
|
|
(svn r11140) -Update: WebTranslator2 update to 2007-09-22 20:52:32 american - 21 fixed by WhiteRabbit (21) brazilian_portuguese - 1 fixed by tucalipe (1) catalan - 1 fixed by arnaullv (1) croatian - 1 fixed by knovak (1) czech - 7 fixed, 1 changed by Hadez (8) danish - 1 fixed by ThomasA (1) dutch - 1 fixed by habell (1) estonian - 1 fixed, 33 changed by kristjans (34) french - 1 fixed by glx (1) romanian - 21 fixed by kneekoo (21) spanish - 1 fixed by eusebio (1) turkish - 16 fixed, 2 changed by jnmbk (18) ukrainian - 1 fixed by mad (1)
|
|
miham
|
r7542:06a007a1c9f9
|
17 years ago
|
|
(svn r11062) -Update: WebTranslator2 update to 2007-09-08 22:37:00 croatian - 1 changed by knovak (1) estonian - 4 fixed, 3 changed by kristjans (7) french - 2 changed by glx (2) hungarian - 4 fixed by miham (4) japanese - 4 fixed by ickoonite (4) norwegian_nynorsk - 14 fixed by pollux (14) slovak - 4 fixed by lengyel (4) slovenian - 4 fixed by Necrolyte (4) spanish - 4 fixed by eusebio (4) turkish - 27 fixed by jnmbk (27) ukrainian - 2 fixed by mad (2)
|
|
rubidium
|
r7440:a7d8cd113b84
|
17 years ago
|
|
|
|
rubidium
|
r7423:ba5e87b6ea9b
|
17 years ago
|
|
|
|
rubidium
|
r7286:2c81eab12f34
|
17 years ago
|
|
|
|
belugas
|
r7218:e0a393364285
|
17 years ago
|
|
(svn r10496) -Feature: Replace all the windows for Industry building by a more flexible one. Thanks to Csaboka (from TTDPatch dev team) for his hints and original design (which i've found while it was halfway done, so i could make it more compliant ;)). Don't expect it to be a carbon-copy though. A few differences can be found here and there. Thanks to Rubidium for his helping hand. Hope you will like it as we do :)
|
|
miham
|
r7201:2dbb51bda5ec
|
17 years ago
|
|
(svn r10479) -Update: WebTranslator2 update to 2007-07-08 19:44:48 american - 4 fixed by WhiteRabbit (4) catalan - 2 fixed by arnaullv (2) czech - 67 fixed by joeprusa (67) danish - 6 fixed by ThomasA (6) dutch - 2 fixed by webfreakz (2) french - 2 fixed by glx (2) german - 23 fixed by chu (23) hungarian - 2 fixed by miham (2) italian - 2 fixed, 4 changed by lorenzodv (6) latvian - 49 fixed by amjaliks (49) portuguese - 66 fixed by izhirahider (66) romanian - 2 fixed by kneekoo (2) slovenian - 2 fixed by Necrolyte (2) traditional_chinese - 2 fixed, 75 changed by xbddc (77) turkish - 7 fixed by jnmbk (7)
|
|
miham
|
r7181:22c11541250e
|
17 years ago
|
|
(svn r10455) -Update: WebTranslator2 update to 2007-07-06 20:02:29 brazilian_portuguese - 4 fixed by tucalipe (4) dutch - 4 fixed by habell (4) estonian - 3 fixed by t2t2 (3) french - 4 fixed by glx (4) galician - 32 fixed by Condex (32) hungarian - 4 fixed by miham (4) italian - 4 fixed by lorenzodv (4) korean - 2 changed by darkttd (2) russian - 4 fixed, 1 changed by Smoky555 (5) slovak - 4 fixed by lengyel (4) spanish - 4 fixed by eusebio (4) traditional_chinese - 4 fixed by xbddc (4) turkish - 10 fixed by jnmbk (10) ukrainian - 4 fixed by mad (4)
|
|
rubidium
|
r7178:1efd685b9751
|
17 years ago
|
|
|
|
glx
|
r7141:9c76f5fd5053
|
17 years ago
|
|
|
|
peter1138
|
r7129:0b65db4eb4e3
|
17 years ago
|
|
|
|
miham
|
r7077:06b5e356aeb7
|
17 years ago
|
|
(svn r10342) -Update: WebTranslator2 update to 2007-06-26 18:48:16 american - 3 fixed by WhiteRabbit (3) brazilian_portuguese - 17 fixed by tucalipe (17) catalan - 15 fixed, 10 changed by arnaullv (25) dutch - 9 fixed by Zr40 (9) estonian - 1 fixed by kristjans (1) french - 17 fixed by glx (17) german - 29 fixed by moewe2 (29) hungarian - 17 fixed by miham (17) italian - 17 fixed, 1 changed by lorenzodv (17), bluesboy84 (1) japanese - 19 fixed by ickoonite (19) korean - 19 fixed by darkttd (19) norwegian_bokmal - 58 fixed by oletk (58) polish - 113 fixed, 32 changed by meush (145) romanian - 18 fixed by kneekoo (18) russian - 15 fixed by Smoky555 (15) slovak - 86 fixed by lengyel (86) spanish - 113 fixed by eusebio (113) swedish - 30 fixed by giddorah (30) traditional_chinese - 16 fixed by xbddc (16) turkish - 21 fixed by jnmbk (21) ukrainian - 15 fixed by znikoz (10), fevral13 (4), mad (1)
|
|
peter1138
|
r7065:fd32e535b204
|
17 years ago
|
|
|
|
peter1138
|
r7061:fe08da939c84
|
17 years ago
|
|
|
|
miham
|
r7053:9ba641f1e6d0
|
17 years ago
|
|
(svn r10318) -Update: WebTranslator2 update to 2007-06-25 11:14:04 bulgarian - 7 fixed by thetitan (7) catalan - 2 fixed, 2 changed by arnaullv (4) danish - 15 fixed, 5 changed by ThomasA (20) dutch - 8 fixed, 39 changed by Zr40 (45), webfreakz (2) estonian - 2 fixed, 2 changed by t2t2 (4) french - 7 fixed by Skiper (7) hungarian - 1 fixed by miham (1) italian - 2 fixed, 2 changed by lorenzodv (4) russian - 57 fixed by Smoky555 (57) spanish - 8 fixed by eusebio (8) traditional_chinese - 1 fixed, 2 changed by xbddc (3) turkish - 52 fixed by jnmbk (52) ukrainian - 3 fixed, 2 changed by fevral13 (5)
|
|
rubidium
|
r7036:13b1355e730f
|
17 years ago
|
|
|
|
rubidium
|
r7005:9f6265c4d056
|
17 years ago
|
|
|
|
rubidium
|
r6931:482711a174a6
|
17 years ago
|
|
|
|
miham
|
r6911:ed6c7a27b50b
|
17 years ago
|
|
(svn r10164) -Update: WebTranslator2 update to 2007-06-15 07:44:28 catalan - 2 fixed by arnaullv (2) dutch - 2 fixed by habell (2) esperanto - 1 fixed by LaPingvino (1) norwegian_bokmal - 24 fixed by oletk (24) turkish - 16 fixed by jnmbk (16)
|
|
rubidium
|
r6795:34269b3e6a4b
|
17 years ago
|
|
|
|
miham
|
r6777:bd3be138a7cd
|
17 years ago
|
|
(svn r10013) -Update: WebTranslator2 update to 2007-06-01 19:05:03 american - 7 fixed by WhiteRabbit (7) catalan - 1 fixed by arnaullv (1) danish - 37 fixed, 7 changed by ThomasA (44) french - 7 fixed, 1 changed by glx (8) italian - 7 fixed, 1 changed by lorenzodv (8) korean - 7 fixed by darkttd (7) swedish - 8 fixed by giddorah (8) turkish - 23 fixed by jnmbk (23) ukrainian - 1 fixed by mad (1)
|
|
miham
|
r6680:f532dbe9464f
|
17 years ago
|
|
(svn r9911) -Update: WebTranslator2 update to 2007-05-24 23:07:47 american - 2 fixed by WhiteRabbit (2) brazilian_portuguese - 9 fixed by tucalipe (9) bulgarian - 30 fixed by thetitan (30) czech - 34 fixed by Hadez (34) dutch - 2 fixed by habell (2) french - 2 fixed, 12 changed by glx (14) hungarian - 2 fixed by miham (2) japanese - 34 fixed, 8 changed by ickoonite (42) russian - 42 fixed by HMage (42) slovak - 9 fixed by lengyel (9) turkish - 25 fixed by jnmbk (25) ukrainian - 34 fixed by mad (34)
|
|
miham
|
r6582:0b46f6cf62fa
|
17 years ago
|
|
(svn r9796) -Update: WebTranslator2 update to 2007-05-06 19:05:33 brazilian_portuguese - 10 fixed by tucalipe (10) bulgarian - 5 fixed by thetitan (5) catalan - 9 fixed by arnaullv (9) czech - 9 fixed by Hadez (9) esperanto - 11 fixed by LaPingvino (11) finnish - 11 fixed by habazi (11) french - 9 fixed by belugas (9) german - 9 fixed by Neonox (9) hungarian - 9 fixed by miham (9) italian - 9 fixed by lorenzodv (9) japanese - 2 fixed by ickoonite (2) korean - 9 fixed by darkttd (9) norwegian_nynorsk - 11 fixed by pollux (11) polish - 8 fixed by meush (8) portuguese - 21 fixed, 6 changed by supra90 (27) romanian - 11 fixed by kneekoo (11) spanish - 2 fixed by eusebio (2) swedish - 11 fixed by giddorah (11) traditional_chinese - 11 fixed, 2 changed by xbddc (13) turkish - 8 fixed by jnmbk (8) ukrainian - 11 fixed by mad (11)
|
|
miham
|
r6497:5fc879db3bf2
|
17 years ago
|
|
(svn r9680) -Update: WebTranslator2 update to 2007-04-19 21:10:21 bulgarian - 2 fixed by thetitan (1), kokobongo (1) czech - 2 fixed by joeprusa (2) danish - 2 fixed by ThomasA (2) dutch - 2 fixed, 1 changed by habell (3) esperanto - 2 fixed by LaPingvino (2) estonian - 2 fixed by vermon (2) finnish - 2 fixed by habazi (2) german - 3 fixed by Neonox (3) italian - 18 fixed, 2 changed by lorenzodv (20) japanese - 10 fixed by ickoonite (10) norwegian_bokmal - 27 fixed by oletk (27) polish - 10 fixed by meush (10) russian - 2 fixed by HMage (2) spanish - 2 fixed by jfrank (2) traditional_chinese - 2 fixed by xbddc (2) turkish - 11 fixed by jnmbk (11) ukrainian - 2 fixed, 5 changed by fevral13 (7)
|
|
miham
|
r6445:ff2c39463251
|
17 years ago
|
|
(svn r9585) -Update: WebTranslator2 update to 2007-04-10 14:52:27 romanian - 26 fixed, 7 changed by kneekoo (33) turkish - 11 fixed by jnmbk (11)
|
|
maedhros
|
r6408:7d221d8626b0
|
17 years ago
|
|
|
|
miham
|
r6395:cb11d86befed
|
17 years ago
|
|
(svn r9525) -Update: WebTranslator2 update to 2007-03-29 19:56:13 estonian - 3 fixed, 4 changed by kristjans (7) finnish - 2 fixed by pallokala (2) italian - 1 changed by lorenzodv (1) traditional_chinese - 1 changed by xbddc (1) turkish - 12 fixed by jnmbk (12)
|
|
miham
|
r6292:378cf0e134e5
|
17 years ago
|
|
|
|
rubidium
|
r6210:3e0a81250f47
|
17 years ago
|
|
|
|
miham
|
r6185:e1a30e9bbd55
|
17 years ago
|
|
(svn r8957) -Update: WebTranslator2 update to 2007-03-01 21:03:45 afrikaans - 69 fixed, 24 changed by TrueTenacity (93) american - 1 fixed by WhiteRabbit (1) brazilian_portuguese - 14 fixed, 9 changed by tucalipe (11), fukumori (12) catalan - 13 fixed by arnaullv (13) czech - 13 fixed by Hadez (13) dutch - 13 fixed by habell (13) esperanto - 13 fixed by LaPingvino (13) french - 13 fixed, 1 changed by glx (14) german - 13 fixed by Neonox (13) hungarian - 13 fixed by miham (13) icelandic - 1 fixed by scrooge (1) italian - 13 fixed by sidew (13) japanese - 4 fixed by ickoonite (4) korean - 3 fixed by darkttd (3) norwegian_bokmal - 1 fixed by oletk (1) polish - 14 fixed by meush (14) portuguese - 11 fixed by izhirahider (11) russian - 13 fixed, 25 changed by DarkFenX (38) slovak - 16 fixed, 33 changed by lengyel (49) slovenian - 13 fixed by Necrolyte (13) spanish - 13 fixed by eusebio (13) swedish - 13 fixed by daishan (13) traditional_chinese - 9 fixed, 3 changed by thomasau (12) turkish - 13 fixed by jnmbk (13) ukrainian - 15 fixed, 29 changed by mad (32), znikoz (12)
|
|
miham
|
r6038:3dc0e7dbcac3
|
17 years ago
|
|
(svn r8764) -Update: WebTranslator2 update to 2007-02-16 22:03:24 afrikaans - 1 changed by TrueTenacity (1) brazilian_portuguese - 1 fixed, 1 changed by fukumori (2) bulgarian - 4 fixed by groupsky (4) dutch - 3 fixed by habell (3) esperanto - 3 fixed by LaPingvino (3) finnish - 5 fixed by kerba (5) icelandic - 15 fixed, 30 changed by scrooge (45) italian - 3 fixed by sidew (3) norwegian_bokmal - 13 fixed by oletk (13) turkish - 3 fixed by jnmbk (3)
|
|
tron
|
r5926:a5c8facf9039
|
17 years ago
|
|
(svn r8563) -Fix
Replace very old tabs which should be spaces by spaces
|
|
miham
|
r5904:f2b51626dbef
|
17 years ago
|
|
(svn r8527) -Update: WebTranslator2 update to 2007-02-02 07:41:47 brazilian_portuguese - 6 fixed, 363 changed by fukumori (369) bulgarian - 6 fixed by groupsky (6) catalan - 6 fixed by arnaullv (6) croatian - 54 fixed, 3 changed by tperic (57) czech - 6 fixed by Hadez (6) danish - 2 fixed, 1 changed by MiR (3) dutch - 2 fixed by habell (2) estonian - 6 fixed by kristjans (6) french - 4 fixed by glx (4) german - 6 fixed, 2 changed by Neonox (8) hungarian - 2 fixed by miham (2) italian - 6 fixed, 4 changed by lorenzodv (6), sidew (4) japanese - 6 fixed by ickoonite (6) polish - 4 fixed by meush (4) simplified_chinese - 6 fixed by Fishingsnow (6) slovenian - 39 fixed, 1 deleted, 2 changed by Necrolyte (42) turkish - 6 fixed by jnmbk (6) ukrainian - 41 fixed, 1 deleted, 22 changed by znikoz (1), mad (63)
|
|
Darkvater
|
r5895:02c914ccb95f
|
17 years ago
|
|
|
|
Darkvater
|
r5890:b515408b5443
|
17 years ago
|
|
|
|
miham
|
r5862:727e1e4b7a7f
|
17 years ago
|
|
(svn r8443) -Update: WebTranslator2 update to 2007-01-28 19:36:45 czech - 4 fixed by Hadez (4) danish - 1 changed by MiR (1) korean - 3 changed by darkttd (3) turkish - 4 fixed by jnmbk (4)
|
|
miham
|
r5797:45c595bbe802
|
17 years ago
|
|
|
|
miham
|
r5727:f1dbb3269d90
|
18 years ago
|
|
(svn r8266) -Update: WebTranslator2 update to 2007-01-18 19:42:06 afrikaans - 26 fixed, 63 changed by TrueTenacity (89) dutch - 1 fixed by habell (1) esperanto - 1 fixed by LaPingvino (1) russian - 26 changed by DarkFenX (26) turkish - 1 fixed by jnmbk (1) ukrainian - 6 changed by znikoz (6)
|
|
miham
|
r5649:b17ccebc867c
|
18 years ago
|
|
(svn r8108) WebTranslator2 update to 2007-01-13 19:32:03 danish - 56 changed by MiR (56) french - 4 fixed by glx (4) japanese - 77 fixed, 23 changed by ickoonite (100) norwegian_nynorsk - 5 fixed, 1 changed by pollux (6) turkish - 4 fixed by jnmbk (4)
|
|
miham
|
r5588:b4185f74dd9c
|
18 years ago
|
|
(svn r8039) WebTranslator2 update to 2007-01-10 19:58:43 brazilian_portuguese - 15 changed by fukumori (15) danish - 23 changed by MiR (23) greek - 12 fixed by Kesnar (12) japanese - 282 fixed by ickoonite (282) slovenian - 1 changed by Necrolyte (1) turkish - 2 changed by jnmbk (2) ukrainian - 30 changed by znikoz (30)
|
|
miham
|
r5565:2df3a5d28fbb
|
18 years ago
|
|
(svn r7975) WebTranslator2 update to 2007-01-08 09:13:29 brazilian_portuguese - 6 fixed, 2 changed by fukumori (8) danish - 5 changed by MiR (3), ThomasA (2) estonian - 1 changed by kristjans (1) frisian - 82 fixed, 85 changed by ikkejw (82), talzaroff (85) greek - 64 fixed, 3 changed by Kesnar (67) italian - 1 changed by sidew (1) japanese - 92 fixed by ickoonite (92) polish - 1 changed by meush (1) slovak - 7 changed by lengyel (7) slovenian - 160 fixed by Necrolyte (160) turkish - 2 changed by jnmbk (2)
|
|
Darkvater
|
r5563:8d39cf0c86ab
|
18 years ago
|
|
|
|
Darkvater
|
r5562:9c2b1c9012d4
|
18 years ago
|
|
|
|
miham
|
r5548:6805c90a030c
|
18 years ago
|
|
(svn r7905) WebTranslator2 update to 2007-01-06 15:28:31 estonian - 5 changed by kristjans (5) frisian - 669 fixed, 17 changed by ikkejw (574), Bouke (2), talzaroff (110) italian - 1 changed by sidew (1) turkish - 2 fixed, 16 changed by jnmbk (18)
|
|
rubidium
|
r5475:3f5cd13d1b63
|
18 years ago
|
|
(svn r7759) -Merge: makefile rewrite. This merge features: - A proper ./configure, so everything needs to be configured only once, not for every make. - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies. - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC. - Proper support for OSX universal binaries. - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files. - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
|