Commit Graph

222 Commits

Author SHA1 Message Date
glx
e93f03cf84 (svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto) 2008-03-15 22:43:28 +00:00
frosch
4ec7f33f8c (svn r12313) -Fix: YAPF and NTP did not apply penalty for uphill tracks on steep slopes. 2008-02-28 17:34:34 +00:00
glx
2007e53a8d (svn r12282) -Fix (r12123): generate.vbs should not skip files in NO_THREADS section of source.list 2008-02-26 22:32:27 +00:00
KUDr
ff7e789f83 (svn r12252) -Fix [FS#1801]: Broken FollowTrack_t related functions (thanks michi_cc).
-Fixed by removing FollowTrack_t structure and all related functions. Their purpose was to allow to call track followers from C code. They were:
  1. never used
  2. obsoleted by switching to C++
2008-02-25 15:09:22 +00:00
glx
56c9c0a612 (svn r12238) -Change [FS#1800]: set svn:executable property for *.vbs (michi_cc) 2008-02-24 22:16:36 +00:00
glx
ccfae56690 (svn r12123) -Add: generate.vbs script to allow project files generation for users unable to run generate bash script 2008-02-12 14:20:55 +00:00
peter1138
d6670eed6b (svn r12122) -Codechange: Add framework for generic feature callbacks, along with some parts for AI use. 2008-02-12 13:23:57 +00:00
glx
7d88f6688e (svn r12117) -Fix (r12115): strgen compilation was broken 2008-02-12 02:39:22 +00:00
glx
f20cf510e4 (svn r12116) -Fix (r12083): little typos in source.list 2008-02-11 21:01:43 +00:00
smatz
05169f53be (svn r12115) -Codechange: move malloc/realloc error messages to separate file to spare 4-8kB of binary size 2008-02-11 20:23:38 +00:00
belugas
806c3e141d (svn r12089) -Cleanup: re-order, yet another time, the files in msvc projects 2008-02-09 02:46:49 +00:00
belugas
8c32e8ad65 (svn r12083) -Cleanup: Adding some more files in MSVC projects 2008-02-07 18:02:22 +00:00
belugas
bb2dd8beb3 (svn r12082) -Cleanup: MSVC projects do not care about the directory of the file while sorting. Only the "Absolute" name matters 2008-02-07 17:24:38 +00:00
belugas
70241f804b (svn r12081) -Codechange: Rename table/roadveh.h to table/roadveh_movment.h
It is more descriptive name and it will not upset the generate script anymore
2008-02-07 17:01:06 +00:00
belugas
fc940e86b4 (svn r12078) -Cleanup: Add missing headers on project files 2008-02-07 04:47:38 +00:00
belugas
caffe1ddac (svn r12077) -Cleanup: Remove files not used anymore from project files 2008-02-07 03:45:02 +00:00
rubidium
f037d98ef4 (svn r11979) -Codechange: drop MSVC 2003 support because MSVC 2003 is broken in such a manner that it triggers an internal compiler error without any clue what of the code is wrong. Even trying to bisect the problem does not give a single line of code that causes the trouble. 2008-01-24 18:47:05 +00:00
smatz
74af65e556 (svn r11968) -Codechange: remove redundant FindLengthOfTunnel(), use GetTunnelBridgeLength() and/or GetOtherTunnelEnd() instead 2008-01-23 22:34:04 +00:00
peter1138
a4ba98af86 (svn r11850) -Fix (r11848): forgot to update vc project files 2008-01-14 16:40:31 +00:00
smatz
bc4ed3eafd (svn r11802) -Fix [FS#716]: do not crash trains when leaving depot to a very long track
-Codechange: use dedicated pathfinder for signal updating, resulting in better performance and possible future improvements
2008-01-09 23:00:59 +00:00
rubidium
444e77d8bc (svn r11774) -Change: do not include variables.h in a header when it is not needed. 2008-01-07 00:57:19 +00:00
skidd13
df3815b8dd (svn r11699) -Cleanup: Remove some headers from the project files which aren't there anymore 2007-12-25 18:25:25 +00:00
rubidium
be923601bf (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 2007-12-19 23:26:02 +00:00
glx
4bc3a244f5 (svn r11658) -Fix (r11654): forgot project files 2007-12-17 23:30:25 +00:00
smatz
926fe5c9e9 (svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h 2007-12-16 15:38:51 +00:00
smatz
6ab52ddf89 (svn r11576) -Codechange: enumerize and comment station GUI 2007-12-05 17:08:10 +00:00
rubidium
2cf5a203ce (svn r11531) -Fix [FS#1459]: version determination did stall (read: never finish) when both svn and git were not installed. 2007-11-26 23:28:29 +00:00
skidd13
057ae477b5 (svn r11527) -Codechange: Split the bitmath functions of to their own files 2007-11-26 17:50:22 +00:00
skidd13
4e12073b27 (svn r11490) -Codechange: Split the math functions to their own header
-Codechange: Replace the rest of the math macros with functions
2007-11-22 18:01:51 +00:00
skidd13
039570342d (svn r11488) -Codechange: Spilt the random functions out to seperate file
-Codechange: Make the mersenne twister more readable
-Codechange: Unify the seeding process of random
2007-11-21 19:13:38 +00:00
glx
be591f158e (svn r11470) -Codechange: add git detection to MSVC (michi_cc) 2007-11-18 22:39:02 +00:00
glx
0bba49b413 (svn r11448) -Add: project files for MSVC 2008 (*_vs90.*) 2007-11-17 02:22:56 +00:00
glx
f9eba326c3 (svn r11445) -Codechange: reorder <configuration> in openttd_vs80.vcproj, so there are less diff when it is modified by MSVC 2007-11-16 22:11:30 +00:00
belugas
f26a591e6c (svn r11399) -Feature(ette): transparency settings can now be saved and thus remembered.
-Codechange: Wrap all transparency settings in accessors, hiding the implementation
-Change: Clicking "transparent building" menu will toggle Houses And Trees only.  The other options can be used in the transparency gui.
Initial patch by Smatz (FS#1349), with some rework by BigBB and your humble servant.
2007-11-10 01:17:15 +00:00
glx
990fd0204f (svn r11393) -Fix (r11368): forgot to update lang project files 2007-11-08 16:11:25 +00:00
glx
5131ea98db (svn r11334) -Codechange: add hg detection to MSVC 2007-10-21 17:09:44 +00:00
rubidium
fcce47172d (svn r11330) -Add: OTTD version checking for NewGRFs. This allows NewGRFs to do something different for different versions of OpenTTD, like disabling it for too low versions or loading different graphics. 2007-10-21 14:59:05 +00:00
rubidium
80a3590bf5 (svn r11172) -Codechange: rewrite of town road building and addition of the possibility to clean up unconnected road bits during the local road reconstructions. Based on a patch by skidd13. 2007-09-26 16:12:43 +00:00
glx
822b40a026 (svn r11166) -Fix (r11165): forgot one project file 2007-09-26 02:45:13 +00:00
belugas
94ab174776 (svn r11165) -Fix(r11164): an unwelcome change in MSVC projects/openttd_vs80.vcproj, plus a fix in source.list 2007-09-26 02:29:34 +00:00
belugas
41ecae2783 (svn r11164) -Fix(r11161): a rogue space roaming in the night... removed 2007-09-26 02:20:58 +00:00
rubidium
ed96cd2711 (svn r11138) -Codechange: prepare some subsystems for persistent storage for NewGRFs. 2007-09-22 12:59:43 +00:00
glx
87b487d790 (svn r11110) -Fix (r11107): somebody forgot to update project files ;) 2007-09-14 23:46:49 +00:00
glx
426b18f635 (svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces 2007-09-12 22:05:53 +00:00
rubidium
e9924421bf (svn r11089) -Codechange: add revision detection to MSVC. 2007-09-12 07:11:48 +00:00
truelight
f827093ba7 (svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
-Add: let 32bpp-anim use 32bpp-optimizeds, so he profits from the speed-up too
2007-09-09 23:16:01 +00:00
rubidium
a045c22db0 (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading. 2007-07-20 18:34:21 +00:00
rubidium
45b0b7755d (svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs. 2007-07-16 23:55:22 +00:00
glx
52cba88586 (svn r10590) -Fix: cargo_packet.* were not sorted correctly in project files 2007-07-16 13:51:17 +00:00
peter1138
5e85e8c5e0 (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model. 2007-07-05 12:23:54 +00:00
KUDr
92e684c28e (svn r10420) -Fix [MSVC]: Disabled 'Treat Warnings As Errors' for VC8 2007-07-03 23:07:33 +00:00
KUDr
ec1e0b8152 (svn r10391) -Add: debug support - structured dump of variables/classes/structures (with anti-recursion repository) into string 2007-06-29 23:30:14 +00:00
KUDr
65ba91d1c9 (svn r10389) -Add: CStrA, CStrCiA, CStrW, CStrCiW - case sensitive/insensitive ANSI/UNICODE string classes that support formatted (sprintf like) output. 2007-06-29 22:33:58 +00:00
miham
75debb19bf (svn r10385) -Change: [Translations] Croatian is an accepted language 2007-06-29 12:27:13 +00:00
rubidium
fc201d4ad8 (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. 2007-06-22 11:58:59 +00:00
truelight
73f593f93d (svn r10264) -Fix: forgot to add texteff.hpp to the project files 2007-06-22 09:44:21 +00:00
maedhros
7fb6e8f11d (svn r10236) -Feature: Introduce a form of timetabling for vehicles. 2007-06-20 19:17:22 +00:00
glx
168eee00cd (svn r10231) -Cleanup: MSVC project files 2007-06-20 03:01:27 +00:00
glx
623a848cca (svn r10211) -Feature: [NewGRF] Add support for action 0F 2007-06-18 23:00:55 +00:00
truelight
79cd3f5db0 (svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
-Codechange: introduced a hierachy of blitters to avoid a lot of code duplication
 Note: this allows much easier adding other types of video-drivers, like OpenGL
2007-06-17 20:30:28 +00:00
truelight
8c3e9d111f (svn r10189) -Add: added a safety check in MSVC project generate script to make sure we do not use filenames with the same name in different directories, as MSVC is plain stupid and can't handle that (go wine to Billy or something if you want it fixed properly) 2007-06-17 20:14:38 +00:00
rubidium
3c7a85fe94 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
-Codechange: add support for personal directories on Windows.
-Fix [FS#153, FS#193, FS#502, FS#816, FS#854]: fix issues related to fixed names, fixed places of files/directories and application bundles.
2007-06-17 15:48:57 +00:00
rubidium
62a4c27829 (svn r10179) -Fix: spritecache wasn't in source.list, thus wasn't in the MSVC project files.
-Fix: Pig Latin wasn't in the MSVC project files.
2007-06-17 12:30:43 +00:00
rubidium
e355b1e55a (svn r10170) -Codechange: remove some duplication of code. 2007-06-16 12:03:36 +00:00
truelight
063c4f7862 (svn r10148) -Fix r10143: make --without-png to compile again 2007-06-13 18:52:06 +00:00
truelight
19513f2604 (svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
-Codechange: store the SpriteID in the spritecache too
-Add: add a PNG loader for graphical files
-Documentation: added a document to explain the PNG format
2007-06-13 16:21:11 +00:00
truelight
f782a311f8 (svn r10132) -Codechange: split out the last direct video-buffer read access to the blitter-layer
-Add: added a new renderer and blitter to make room for some optimized bpp
-Fix: fill the alpha channel in the grf-spriteloader
2007-06-13 10:31:40 +00:00
belugas
107c84c3ab (svn r10127) -Add: Addition of basic structure for industry tiles callbacks (unfinished).
-Codechange: ResolverObject receives member gfx, making it compatible for both industries and industry tiles
-Codechange: NewIndustryResolver now has his randombits and triggers (even if not implemented)
2007-06-13 02:29:08 +00:00
truelight
0e53fd6d32 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
-Add: added NULL blitter and renderer, which are always used for -vnull
-Add: dedicated driver doesn't blit nor render by default. Can be overruled by user. (-D -b 8bpp-optimized)
-Remove: removed CTRL+D from win32, which is incompatible with above
-Add: extended screenshot support for PNG and BMP
-Codechange: remove all hardcoded 8bpp references and replace them with more dynamic ones
-Codechange: minor stuff in blitters
2007-06-12 20:24:12 +00:00
truelight
340d5b43f9 (svn r10101) -Codechange: the class is named 8bppSimple, so name the files like that too 2007-06-11 15:13:30 +00:00
truelight
27febd474c (svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
-Add: make it possible to pick your own blitter (-b <blitter>, -h for overview)
-Add: added a new optimized 8bpp blitter (default, caches sprites of all zoom-levels)
-Add: added a debug 8bpp blitter and a very slow normal 8bpp blitter
2007-06-11 11:50:49 +00:00
belugas
1a2f889a52 (svn r10074) -Add: Addition of IndustryOverrideManager as well as the basic (and unfinished) support for callbacks for industries 2007-06-09 02:05:51 +00:00
maedhros
814409fb94 (svn r10010) -Fix (r10008): Add articulated_vehicles.h to the project files. 2007-06-01 12:19:23 +00:00
maedhros
2181e11c18 (svn r10008) -Codechange: Move a couple of functions related to articulated vehicles to a file of their own. 2007-06-01 11:41:02 +00:00
rubidium
8f0f090c51 (svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13. 2007-05-19 09:40:18 +00:00
belugas
641d51a5ad (svn r9850) -Codechange: Introduction of the Override/Substitute manager. Currently only used for newhouses.
Basically, it is more a gathering of IDs from grf files and ingame data.
2007-05-15 21:36:58 +00:00
truelight
dc191785db (svn r9844) -Codechange: replace zoomlevel with an enum
-Codechange: use predefined enums for viewport zoomlevels
2007-05-15 14:08:39 +00:00
truelight
d339143e95 (svn r9798) -Remove: removed the very outdated xcode project files 2007-05-06 19:27:23 +00:00
peter1138
e109773636 (svn r9797) -Feature: [NewGRF] Add action 1, 2 and 3 support for canals. 2007-05-06 18:14:33 +00:00
peter1138
8c67992051 (svn r9564) -Fix (r9563): When adding files remember to add them... 2007-04-05 09:07:20 +00:00
peter1138
51d72c11c8 (svn r9563) -Feature: Add more finer control to transparency options, including a new toolbar, accessible from the map menu or Ctrl X. Patch by Wolf01. 2007-04-05 07:49:04 +00:00
belugas
695ff8dd37 (svn r9557) -Codechange: Add a forgotten file to the project lists 2007-04-04 02:02:49 +00:00
rubidium
eaad1bb2a6 (svn r9522) -Fix (r9073): the entries in source.list are supposed to be sorted alphabetically. 2007-03-28 20:12:32 +00:00
belugas
0bfee2b500 (svn r9521) -Fix(9520): Partly revert, accidentally commited an unnecessary change 2007-03-28 20:11:00 +00:00
belugas
7a0952a5bc (svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc... 2007-03-28 20:06:28 +00:00
belugas
5cc99a51d9 (svn r9470) -Fix: Should not have committed that file 2007-03-26 00:01:42 +00:00
belugas
1597b07849 (svn r9469) -Fix(r3720): The maximum year allowed for to_euro conversion of custom currency was set to 1000, making it impossible to ever have one. Now, with 3000, it should be a little more comfortable 2007-03-25 23:57:09 +00:00
peter1138
f69549f1eb (svn r9418) -Codechange: Implement actions 1/2/3 for cargos, callback handler and custom icon sprites 2007-03-23 20:55:45 +00:00
belugas
c5cc1ff382 (svn r9401) -Fix(9400): was not supposed to commit that file 2007-03-22 04:10:05 +00:00
belugas
691f8578fd (svn r9400) -Codechange: Use some more representative enum names for landscape types. 2007-03-22 03:42:43 +00:00
maedhros
209101391a (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
the newhouses grf specs, so all newhouses grfs will be playable in the game.

Many thanks to everyone who contributed code and ideas, and all the testers
who found things we missed.
2007-03-19 11:27:30 +00:00
Darkvater
6fe5620876 (svn r9082) -Codechange: [win32] Update VS2003 and VS2005 project files to use the same outpath, and build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better).
-Remove: [os/2] Relic project file remains from watcom
2007-03-10 00:25:54 +00:00
bjarni
b6efe5482d (svn r9073) -Codechange: moved autoreplace to a file of it's own (now autoreplace has a cmd and a gui file) 2007-03-08 23:05:05 +00:00
rubidium
5b4b9cbd5c (svn r8969) -Codechange: rework of the player face bits.
- introduce a new format (with backward compatability) that is more clear and needs a much simpler face drawer
 - replace tons of ifs/switches/magic numbers by table lookups
2007-03-02 01:17:11 +00:00
glx
51d2dfa05d (svn r8948) -Change: some sed implementations have problems with \n so rewrite r8832 using awk 2007-02-28 23:52:04 +00:00
peter1138
2306a02f75 (svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions. 2007-02-22 22:09:51 +00:00
rubidium
b563bc2c40 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005.
For some reason the internal formatting of the XML between MSVC2003 and MSVC2005 differs, so adding a file in MSVC2005 would result in basically adding the entire openttd_vs80.vcproj to the diff.
2007-02-21 17:59:34 +00:00
peter1138
3d581f4f89 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. 2007-02-20 22:09:21 +00:00
truelight
a839800c4a (svn r8772) -Fix: forgot to update 'generate' file while updating 'configure' in the last 3 changes in 'configure' 2007-02-17 12:50:19 +00:00
glx
c18454bf1c (svn r8677) -Fix r8615: removed 'debug' language from project files 2007-02-11 14:25:02 +00:00
miham
80578ff71a (svn r8615) [Translations] -Prepare: added traditional chinese to project files as well 2007-02-06 21:30:40 +00:00
Darkvater
737ca7b7f5 (svn r8435) -Regression (r7759?): Readd aircraft.h to the project files which were added in r6644 but miracuously disappeared sometime afterwards 2007-01-28 00:28:12 +00:00
KUDr
55ac8f843a (svn r8414) -Codechange: Use own AutoPtrT instead of std::auto_ptr.
-Simplifies assignment from raw pointers
 -Should be harder to crash the program by incorrect assignment into it.
 -Should help with MorphOS compilation errors
2007-01-26 11:38:07 +00:00
bjarni
10d6f066e4 (svn r8371) -Codechange: [autoreplace GUI] moved the autoreplace GUI to a file of it's own
Note: it's the same as r8363, only this time the svn history of autoreplace should be preserved
2007-01-23 13:26:12 +00:00
bjarni
751409fe83 (svn r8370) -Revert (r8363): the autoreplace GUI move cleared the file history 2007-01-23 13:10:43 +00:00
bjarni
a7edefb8d7 (svn r8363) -Codechange: [autoreplace GUI] moved the autoreplace GUI to a file of it's own 2007-01-23 00:04:17 +00:00
truelight
61eef2ded9 (svn r8326) -Fix r8304: forgot to update projects/generate to keep in mind the new WINCE tag in sources.list
-Fix: MSVC doesn't order files itself, so put win32.cpp in the right place ourself
-Update: update the MSVC projects files for r8324 (MiHaMiX)
2007-01-21 19:40:38 +00:00
maedhros
babda828ab (svn r8301) -Codechange: Move the code relating to the sign list window from graph_gui.cpp to a file of its own: signs_gui.cpp. 2007-01-21 12:35:35 +00:00
peter1138
b01d4375e9 (svn r8286) -Add: Korean translation by Ezi 2007-01-20 09:19:37 +00:00
KUDr
3ad14cc7a8 (svn r8125) -Codechange: Station is now constructed/destroyed using new/delete operators (don't worry, they still use the same memory pool). Few station related functions turned into Station::methods (just first step). All this new stuff moved from station_cmd.cpp to the new file (station.cpp). 2007-01-14 19:18:50 +00:00
belugas
2bdbca7784 (svn r8112) -Codechange: MSVC solution files will now make it so that openttd will be THE startup project.
Take note that it will only be the case on a clean checkout, without any other files than those coming from that checkout.
2007-01-14 01:27:19 +00:00
KUDr
43ccaf25a8 (svn r8104) -Fix: missing helpers.hpp added into source.list and VC 2007-01-13 16:23:24 +00:00
KUDr
6c1cd5eab8 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) 2007-01-13 15:22:36 +00:00
miham
86d12372b3 (svn r8085) [Translations] fixed the filenames to the scheme the others use, updated projectfile, sorry 2007-01-12 22:32:58 +00:00
miham
18ac722988 (svn r8084) [Translations] Added nynorsk translation (pollux), renamed norwegian to norwegian bokmal, moved nynorsk to finished languages, and updated project files.
Strings pending to nynorsk will be preserved if they are differ from the current translation
2007-01-12 22:27:27 +00:00
miham
a68def49db (svn r8069) [Translations] Moved japanese from unfinished, good job translators 2007-01-11 19:35:30 +00:00
rubidium
a7d0cdf95f (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. 2007-01-10 18:56:51 +00:00
rubidium
ce75f6549d (svn r8037) -Fix (r7987): MSVC project files were not updated with respect to the addition of slovenian. 2007-01-10 18:44:52 +00:00
rubidium
b722317116 (svn r7829) -Codechange: move the network (core) initialization/shutdown functions into network/core, so the can be reused in the masterserver_updater. 2007-01-04 18:50:40 +00:00
glx
8d3e946b81 (svn r7809) -Fix: convert \r to \n before parsing files with awk in projects/generate so it works using mingw/msys 2007-01-03 22:24:36 +00:00
miham
b5114bbc4f (svn r7807) [Translations] Fix: r7806. Forgot to generate project files to include lithuanian 2007-01-03 20:49:08 +00:00
rubidium
013df98f79 (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.
2007-01-02 19:19:48 +00:00