merge fixing
authorplaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Sun, 9 Jan 2011 09:03:38 +0000 (09:03 +0000)
committerplaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Sun, 9 Jan 2011 09:03:38 +0000 (09:03 +0000)
commit49bd899b152477c171497b8961edc4f26745eeda
tree9762daed4595aec320434a89f8e10319841b149e
parentc43508a326870b1ece3bca7d2b57149507ee607c
merge fixing

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@98 180e2498-e6e9-4542-8430-84ac67f01cd8
src/net/sf/openrocket/gui/print/visitor/BaseVisitorStrategy.java
src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java
src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java
src/net/sf/openrocket/gui/print/visitor/StageVisitorStrategy.java