marco
|
f42dffb36d
--- Merging r39877 into '.':
|
6 years ago |
marco
|
e1d32d0fef
# revisions: 39793,39850,39852,39910,40020,40021,40022,40024,40096
|
6 years ago |
marco
|
338873d7a7
--- Merging r39785 into '.':
|
7 years ago |
marco
|
2b01261f36
--- Recording mergeinfo for merge of r39673 into '.':
|
7 years ago |
marco
|
9135b53764
--- Merging r39770 into '.':
|
7 years ago |
marco
|
2f4f80a406
--- Merging r39747 into '.':
|
7 years ago |
marco
|
ee7090b118
--- Merging r39711 into '.':
|
7 years ago |
marco
|
edf32cd5dc
The Important Ones:
|
7 years ago |
marco
|
ced4e6c27d
--- Merging r39714 into '.':
|
7 years ago |
marco
|
a50560f383
--- Merging r39706 into '.':
|
7 years ago |
marco
|
d8cd1baf82
--- Merging r39670 into '.':
|
7 years ago |
marco
|
36b61f985f
--- Merging r39707 into '.':
|
7 years ago |
pierre
|
da2eca3b8e
Merge of trunk rev 39765, update of utils/fpcm/revision.inc after merge 39766
|
7 years ago |
pierre
|
9334eeaa7e
--- Merging r39756 and r39757 into 'fixes_3_2' branch:
|
7 years ago |
pierre
|
ecbaaac1b8
Commit updated revision.inc file
|
7 years ago |
marco
|
08f93784a5
--- Merging r39681 into '.':
|
7 years ago |
marco
|
c5e1d72b71
--- Merging r39666 into '.':
|
7 years ago |
marco
|
cdd16222d4
--- Merging r39657 into '.':
|
7 years ago |
marco
|
f53309b61c
--- Merging r39644 into '.':
|
7 years ago |
marco
|
6c18952679
* merge ver2_ and ver3_0_0 deprecations
|
7 years ago |
marco
|
340c62d2e7
more version updates
|
7 years ago |
marco
|
bceb71bf9f
* version to 3.2.0-beta
|
7 years ago |
marco
|
37aee1ce08
* merged removing revision + date from generated makefiles.
|
7 years ago |
marco
|
57b73f7022
* don't include date/rev info of fpcmake. complicates merging.
|
7 years ago |
marco
|
d143ab60e1
* regenned makefile without date/rev components for easier merging.
|
7 years ago |
marco
|
685f9952b8
Creating branch branches/fixes_3_2
|
7 years ago |
marco
|
4dbc2ae873
* enable processunicode in fpmake and .fpcmake for win32 and win64.
|
7 years ago |
marco
|
9b969c6cca
* second part processunicode commit.
|
7 years ago |
marco
|
b7e6492119
* Unicode version TProcess in two commits.
|
7 years ago |
marco
|
ee810cea10
* give stderr as much chance to drain as output per runcommandloop cycle.
|
7 years ago |