fpc/utils/fpcm/revision.inc
marco 6ecfc996b0 --- Merging r29401 into '.':
U    rtl/unix/dl.pp
U    rtl/android/Makefile.fpc
A    rtl/android/dlandroid.inc
U    rtl/android/Makefile
--- Merging r29402 into '.':
U    utils/fpcm/revision.inc
--- Merging r29418 into '.':
U    rtl/android/dlandroid.inc
--- Merging r29419 into '.':
U    utils/pas2jni/readme.txt
U    utils/pas2jni/writer.pas
U    utils/pas2jni/ppuparser.pas
--- Merging r29420 into '.':
U    packages/fcl-db/src/sqldb/odbc/odbcconn.pas

# revisions: 29401,29402,29418,29419,29420

git-svn-id: branches/fixes_3_0@29421 -
2015-01-05 19:27:06 +00:00

2 lines
23 B
C++