.gitignore
RQ editos
.
Initial separation of refas from productline
.
.
dev Refas - split palettes
dev Refas - split palettes
old working
MultiViews
Clonning (Deleting pending, edited clonned to improve)
General (new, start, to fix)
sin conflicto
Merge branch 'master' of local repository into development

Conflicts:
	com.variamos.rq.concepts/src/com/variamos/rq/concepts/Goal.java
Merge branch 'development' of https://github.com/jcmunozf/VARIAMOS into
development

Conflicts:
	com.variamos.gui/src/com/mxgraph/examples/swing/editor/BasicGraphEditor.java
	com.variamos.gui/src/com/variamos/gui/maineditor/AbstractGraph.java
	com.variamos.gui/src/com/variamos/gui/maineditor/AbstractGraphEditorFunctions.java
	com.variamos.gui/src/com/variamos/gui/maineditor/Main.java
	com.variamos.gui/src/com/variamos/gui/maineditor/PerspectiveAction.java
	com.variamos.gui/src/com/variamos/gui/maineditor/VariamosGraphEditor.java
	com.variamos.gui/src/com/variamos/gui/pl/editor/PLGraphEditorFunctions.java
	com.variamos.gui/src/com/variamos/gui/pl/editor/actions/OpenAction.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/RQPalettesLoader.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/RefasEditorPopupMenu.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/RefasEditorToolBar.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/RefasGraph.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/RefasGraphEditor.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/RefasGraphEditorFunctions.java
	com.variamos.rq.concepts/src/com/variamos/refas/concepts/Goal.java
	com.variamos.rq.concepts/src/com/variamos/refas/concepts/Refas.java
	com.variamos.rq.concepts/src/com/variamos/refas/concepts/SoftGoal.java
	com.variamos.rq.concepts/src/com/variamos/rq/concepts/Goal.java
Clone solved for: delete and edition (visibily disabled)
No conflicts
Almost functional
missing: save group constraint attributes
		update modelview on file load and on delete
		hide and show relations on SD and claims
Running complete - not fully tested
product line perspective problem solved
Load files corrected
missing: save group constraints
		 load modelview and update modelview
missing files
fix
Merge remote-tracking branch 'upstream/master' into development

Conflicts:
	com.cfm.hlcl/bin/.gitignore
	com.cfm.jgprolog.core/bin/.gitignore
	com.cfm.productline.configurator/bin/.gitignore
	com.cfm.productline.io/.classpath
	com.cfm.productline.solver/bin/com/cfm/productline/solver/PrologSolver.class
	com.cfm.productline.solver/bin/com/cfm/productline/solver/Solver.class
	com.cfm.productline.solver/bin/com/cfm/productline/solver/Test.class
	com.cfm.productline.solver/src/com/cfm/productline/solver/GNUPrologSolver.java
	com.cfm.productline/bin/.gitignore
	com.variamos.gui/.classpath