diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-06-17 19:26:25 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-06-17 19:26:25 +0000 |
commit | 52d969c26bfc55547967dc3e60f8a347ec267750 (patch) | |
tree | 6f9c0a67eb343d272c0b2076d6f6af6e36dd7c0c /utils | |
parent | 10539b2cb3a4574d227e92a04400f6c0256e5e93 (diff) | |
download | fpc-52d969c26bfc55547967dc3e60f8a347ec267750.tar.gz |
--- Merging r29422 through r29424 into '.':
U rtl/android/dlandroid.inc
U rtl/win64/signals.pp
U rtl/win64/system.pp
A rtl/win64/buildrtl.lpi
U rtl/x86_64/cpu.pp
--- Recording mergeinfo for merge of r29422 through r29424 into '.':
U .
--- Merging r29438 into '.':
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r29438 into '.':
G .
--- Merging r29439 into '.':
U packages/fppkg/src/pkgfpmake.pp
U packages/fppkg/src/pkgcommands.pp
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r29439 into '.':
G .
--- Merging r29603 into '.':
U rtl/atari/Makefile.fpc
U rtl/atari/Makefile
--- Recording mergeinfo for merge of r29603 into '.':
G .
--- Merging r29604 into '.':
U rtl/Makefile.fpc
U rtl/Makefile
--- Recording mergeinfo for merge of r29604 into '.':
G .
--- Merging r29808 into '.':
U rtl/win/sysos.inc
--- Recording mergeinfo for merge of r29808 into '.':
G .
# revisions: 29422-29424,29438,29439,29603,29604,29808
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31103 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'utils')
-rw-r--r-- | utils/fppkg/fppkg.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/fppkg/fppkg.pp b/utils/fppkg/fppkg.pp index 7c9b0ea236..34c77d4d59 100644 --- a/utils/fppkg/fppkg.pp +++ b/utils/fppkg/fppkg.pp @@ -104,6 +104,7 @@ begin Writeln(' build Build package'); Writeln(' compile Compile package'); Writeln(' install Install package'); + Writeln(' uninstall Uninstall package'); Writeln(' clean Clean package'); Writeln(' archive Create archive of package'); Writeln(' download Download package'); |