From d408040b2c4a0da2a118e91d0df562519f9c96c3 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Sun, 5 Dec 2010 20:39:17 -0700 Subject: [PATCH] add trademark notice to readme.txt and specify Proguard 4.6 in example --- readme.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index e826ba97e3..6a611da785 100644 --- a/readme.txt +++ b/readme.txt @@ -486,7 +486,7 @@ EOF Step 5: Run ProGuard with stage1 as input and stage2 as output. - $ java -jar ../../proguard4.4/lib/proguard.jar \ + $ java -jar ../../proguard4.6/lib/proguard.jar \ -injars stage1 -outjars stage2 @../vm.pro @hello.pro (note: pass -dontusemixedcaseclassnames to ProGuard when building on @@ -596,3 +596,12 @@ executable, and optionally strip its symbols. $ g++ -rdynamic *.o -ldl -lpthread -lz -o hello $ strip --strip-all hello + + +Trademarks +---------- + +Oracle and Java are registered trademarks of Oracle and/or its +affiliates. Other names may be trademarks of their respective owners. + +The Avian project is not affiliated with Oracle.