Produced by Araxis Merge on 9/25/2018 2:12:58 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
# | Location | File | Last Modified |
---|---|---|---|
1 | build 3.zip\build 3\MHLTH_YS_137_Source\Delphi\MHA_A | YS_MHA_A.dsk | Thu Sep 6 11:30:30 2018 UTC |
2 | build 3.zip\build 3\MHLTH_YS_137_Source\Delphi\MHA_A | YS_MHA_A.dsk | Wed Sep 12 16:03:27 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 490 |
Changed | 1 | 2 |
Inserted | 0 | 0 |
Removed | 0 | 0 |
Whitespace | |
---|---|
Character case | Differences in character case are significant |
Line endings | Differences in line endings (CR and LF characters) are ignored |
CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
1 | [Closed Fi les] | |
2 | File_0=Sou rceModule, 'C:\Projec ts\Patch 9 8 MHA DLL\ fMHA_DLL_D ataEntry.p as',0,1,15 93,1,1383, 0,0 | |
3 | File_1=Sou rceModule, 'C:\Projec ts\IA Core \uIA_Instr ument_IO.p as',0,1,10 8,3,132,0, 0 | |
4 | File_2=Sou rceModule, 'C:\Projec ts\IA Core \uIA_Instr ument.pas' ,0,1,199,7 7,215,0,0 | |
5 | File_3=Sou rceModule, 'C:\Projec ts\Patch 9 8 MHA DLL\ uMHA_DLL_C onst.pas', 0,1,1,1,1, 0,0 | |
6 | File_4=Sou rceModule, 'C:\Projec ts\Patch 9 8 MHA DLL\ uMHA_DLL_R egistry.pa s',0,1,131 ,1,1,0,0 | |
7 | File_5=Sou rceModule, 'C:\DOCUME ~1\ DN S ~1\LOCALS~ 1\Temp\UMH A_D~1.PAS' ,0,1,132,1 ,142,0,0 | |
8 | File_6=Sou rceModule, 'C:\Projec ts\Patch 9 8 MHA DLL\ uMHA_DLL_G AF_IO.pas' ,0,1,191,3 7,207,0,0 | |
9 | ||
10 | [Modules] | |
11 | Module0=C: \projects\ Patch 98 M HA DLL\uMH A_DLL.pas | |
12 | Module1=C: \projects\ Patch 98 M HA DLL\YS_ MHA_A.dpr | |
13 | Count=2 | |
14 | EditWindow Count=1 | |
15 | ||
16 | [C:\projec ts\Patch 9 8 MHA DLL\ uMHA_DLL.p as] | |
17 | ModuleType =SourceMod ule | |
18 | FormState= 0 | |
19 | FormOnTop= 0 | |
20 | ||
21 | [C:\projec ts\Patch 9 8 MHA DLL\ YS_MHA_A.d pr] | |
22 | ModuleType =SourceMod ule | |
23 | FormState= 0 | |
24 | FormOnTop= 0 | |
25 | ||
26 | [C:\Progra m Files\Bo rland\Delp hi7\Projec ts\Project Group1.bpg ] | |
27 | FormState= 0 | |
28 | FormOnTop= 0 | |
29 | ||
30 | [EditWindo w0] | |
31 | ViewCount= 2 | |
32 | CurrentVie w=1 | |
33 | View0=0 | |
34 | View1=1 | |
35 | CodeExplor er=CodeExp lorer@Edit Window0 | |
36 | MessageVie w=MessageV iew@EditWi ndow0 | |
37 | Create=1 | |
38 | Visible=1 | |
39 | State=0 | |
40 | Left=164 | |
41 | Top=140 | |
42 | Width=1138 | |
43 | Height=664 | |
44 | MaxLeft=-1 | |
45 | MaxTop=-1 | |
46 | ClientWidt h=1130 | |
47 | ClientHeig ht=630 | |
48 | LeftPanelS ize=190 | |
49 | LeftPanelC lients=Cod eExplorer@ EditWindow 0,Property Inspector | |
50 | LeftPanelD ata=000004 0000000000 7602000000 00000001BE 0000000000 0000010000 0002D80000 0000000000 0200000000 5F00000000 0000000200 000000BE00 00000C0000 00436F6465 4578706C6F 7265720100 0000007602 0000110000 0050726F70 6572747949 6E73706563 746F72FFFF FFFF | |
51 | RightPanel Size=0 | |
52 | BottomPane lSize=0 | |
53 | BottomPane lClients=M essageView @EditWindo w0 | |
54 | BottomPane lData=0000 0400010000 000B000000 4D65737361 6765566965 776A040000 0000000002 4900000000 0000000100 0000000000 0000000000 0001000000 006A040000 00000000FF FFFFFF | |
55 | ||
56 | [View0] | |
57 | Module=C:\ projects\P atch 98 MH A DLL\YS_M HA_A.dpr | |
58 | CursorX=17 | |
59 | CursorY=69 | |
60 | TopLine=48 | |
61 | LeftCol=1 | |
62 | ||
63 | [View1] | |
64 | Module=C:\ projects\P atch 98 MH A DLL\uMHA _DLL.pas | |
65 | CursorX=36 | |
66 | CursorY=44 9 | |
67 | TopLine=67 5 | |
68 | LeftCol=1 | |
69 | ||
70 | [Watches] | |
71 | Count=0 | |
72 | ||
73 | [Breakpoin ts] | |
74 | Count=0 | |
75 | ||
76 | [AddressBr eakpoints] | |
77 | Count=0 | |
78 | ||
79 | [Main Wind ow] | |
80 | Create=1 | |
81 | Visible=1 | |
82 | State=0 | |
83 | Left=164 | |
84 | Top=28 | |
85 | Width=1137 | |
86 | Height=112 | |
87 | MaxLeft=-1 | |
88 | MaxTop=-1 | |
89 | ClientWidt h=1129 | |
90 | ClientHeig ht=78 | |
91 | ||
92 | [ProjectMa nager] | |
93 | Create=1 | |
94 | Visible=0 | |
95 | State=0 | |
96 | Left=369 | |
97 | Top=205 | |
98 | Width=438 | |
99 | Height=665 | |
100 | MaxLeft=-1 | |
101 | MaxTop=-1 | |
102 | ClientWidt h=430 | |
103 | ClientHeig ht=639 | |
104 | TBDockHeig ht=305 | |
105 | LRDockWidt h=438 | |
106 | Dockable=1 | |
107 | ||
108 | [Alignment Palette] | |
109 | Create=1 | |
110 | Visible=0 | |
111 | State=0 | |
112 | Left=200 | |
113 | Top=114 | |
114 | Width=156 | |
115 | Height=84 | |
116 | MaxLeft=-1 | |
117 | MaxTop=-1 | |
118 | ClientWidt h=150 | |
119 | ClientHeig ht=60 | |
120 | ||
121 | [PropertyI nspector] | |
122 | Create=1 | |
123 | Visible=1 | |
124 | State=0 | |
125 | Left=0 | |
126 | Top=228 | |
127 | Width=190 | |
128 | Height=402 | |
129 | MaxLeft=-1 | |
130 | MaxTop=-1 | |
131 | ClientWidt h=190 | |
132 | ClientHeig ht=402 | |
133 | TBDockHeig ht=542 | |
134 | LRDockWidt h=190 | |
135 | Dockable=1 | |
136 | SplitPos=9 3 | |
137 | ArrangeBy= Name | |
138 | SelectedIt em= | |
139 | ExpandedIt ems=FMCtrl Options,FM Gets,FMGet s.GetsFlag s,FMGets.G etsOptions ,FMLister, GetsFlags | |
140 | HiddenCate gories= | |
141 | ||
142 | [Breakpoin tWindow] | |
143 | Create=1 | |
144 | Visible=1 | |
145 | State=0 | |
146 | Left=393 | |
147 | Top=493 | |
148 | Width=737 | |
149 | Height=280 | |
150 | MaxLeft=-1 | |
151 | MaxTop=-1 | |
152 | ClientWidt h=729 | |
153 | ClientHeig ht=254 | |
154 | TBDockHeig ht=280 | |
155 | LRDockWidt h=737 | |
156 | Dockable=1 | |
157 | Column0Wid th=232 | |
158 | Column1Wid th=75 | |
159 | Column2Wid th=200 | |
160 | Column3Wid th=200 | |
161 | Column4Wid th=75 | |
162 | Column5Wid th=75 | |
163 | ||
164 | [ObjectTre e] | |
165 | Create=1 | |
166 | Visible=0 | |
167 | State=0 | |
168 | Left=0 | |
169 | Top=112 | |
170 | Width=190 | |
171 | Height=300 | |
172 | MaxLeft=-1 | |
173 | MaxTop=-1 | |
174 | ClientWidt h=182 | |
175 | ClientHeig ht=274 | |
176 | TBDockHeig ht=300 | |
177 | LRDockWidt h=190 | |
178 | Dockable=1 | |
179 | ||
180 | [fmGrepRes ults] | |
181 | Create=1 | |
182 | Visible=1 | |
183 | State=0 | |
184 | Left=453 | |
185 | Top=53 | |
186 | Width=500 | |
187 | Height=639 | |
188 | MaxLeft=-1 | |
189 | MaxTop=-1 | |
190 | ClientWidt h=492 | |
191 | ClientHeig ht=613 | |
192 | TBDockHeig ht=639 | |
193 | LRDockWidt h=500 | |
194 | Dockable=1 | |
195 | ||
196 | [fmMacroLi brary] | |
197 | Create=1 | |
198 | Visible=0 | |
199 | State=0 | |
200 | Left=550 | |
201 | Top=248 | |
202 | Width=339 | |
203 | Height=403 | |
204 | MaxLeft=-1 | |
205 | MaxTop=-1 | |
206 | ClientWidt h=331 | |
207 | ClientHeig ht=377 | |
208 | TBDockHeig ht=403 | |
209 | LRDockWidt h=339 | |
210 | Dockable=1 | |
211 | ||
212 | [CodeExplo rer@EditWi ndow0] | |
213 | Create=1 | |
214 | Visible=1 | |
215 | State=0 | |
216 | Left=0 | |
217 | Top=12 | |
218 | Width=190 | |
219 | Height=200 | |
220 | MaxLeft=-1 | |
221 | MaxTop=-1 | |
222 | ClientWidt h=190 | |
223 | ClientHeig ht=200 | |
224 | TBDockHeig ht=200 | |
225 | LRDockWidt h=66 | |
226 | Dockable=1 | |
227 | ||
228 | [MessageVi ew@EditWin dow0] | |
229 | Create=1 | |
230 | Visible=0 | |
231 | State=0 | |
232 | Left=12 | |
233 | Top=0 | |
234 | Width=1118 | |
235 | Height=73 | |
236 | MaxLeft=-1 | |
237 | MaxTop=-1 | |
238 | ClientWidt h=1118 | |
239 | ClientHeig ht=73 | |
240 | TBDockHeig ht=73 | |
241 | LRDockWidt h=443 | |
242 | Dockable=1 | |
243 | ||
244 | [DockHosts ] | |
245 | DockHostCo unt=0 | |
246 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.