Author: linus
Date: 2010-04-17 05:41:06-0700
New Revision: 18272

Modified:
   branches/BRANCH_0_30_x/   (props changed)
   branches/BRANCH_0_30_x/src/argouml-app/   (props changed)
   branches/BRANCH_0_30_x/src/argouml-app/tests/org/argouml/profile/   (props 
changed)
   
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml

Log:
Merging rev 18214 from trunk for Issue 6054.

Modified: 
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
Url: 
http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml?view=diff&pathrev=18272&r1=18271&r2=18272
==============================================================================
--- 
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
      (original)
+++ 
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
      2010-04-17 05:41:06-0700
@@ -531,7 +531,6 @@
     <combo name="type" type="Classifier" />
     <combo name="multiplicity" type="Multiplicity" />
     <singlerow name="owner" type="Classifier" />
-    <list name="templateParameter" 
type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" 
/>
     <separator />
     <optionbox name="visibility" type="VisibilityKind" />
     <checkgroup name="modifiers">

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2586623

To unsubscribe from this discussion, e-mail: 
[[email protected]].

Reply via email to