--- Merging r19877 into '.':
G utils/instantfpc/examples/writeparameters.pas
G utils/instantfpc/examples/envvars.pas
G utils/instantfpc/examples/exitcode.pas
G utils/instantfpc/examples/getworkingdirectory.pas
G utils/instantfpc/examples/helloworld.pas
G rtl/win64/signals.pp
C tests/test/testlderror.pp
C tests/webtbs/tw20093a.pp
C tests/webtbs/u_uvmta.pp
C tests/webtbs/uvmt.pp
C tests/webtbs/uvmta_a.pp
C tests/webtbs/uvmta.pp
C tests/webtbs/tw20035c.pp
C tests/webtbs/tw20093.pp
C tests/webtbs/uvmt_a.pp
G packages/fcl-net/examples/cnslookup.pp
Summary of conflicts:
Tree conflicts: 9

# revisions: 19877
r19877 | mazen | 2011-12-19 18:40:02 +0100 (Mon, 19 Dec 2011) | 2 lines
Changed paths:
M /trunk/packages/fcl-net/examples/cnslookup.pp
M /trunk/rtl/win64/signals.pp
M /trunk/tests/test/testlderror.pp
M /trunk/tests/webtbs/tw20035c.pp
M /trunk/tests/webtbs/tw20093.pp
M /trunk/tests/webtbs/tw20093a.pp
M /trunk/tests/webtbs/u_uvmta.pp
M /trunk/tests/webtbs/uvmt.pp
M /trunk/tests/webtbs/uvmt_a.pp
M /trunk/tests/webtbs/uvmta.pp
M /trunk/tests/webtbs/uvmta_a.pp
M /trunk/utils/instantfpc/examples/envvars.pas
M /trunk/utils/instantfpc/examples/exitcode.pas
M /trunk/utils/instantfpc/examples/getworkingdirectory.pas
M /trunk/utils/instantfpc/examples/helloworld.pas
M /trunk/utils/instantfpc/examples/writeparameters.pas

* Removed executable flag from source files.

git-svn-id: branches/fixes_2_6@21515 -