Commit edd2b5ca authored by Romain Bioteau's avatar Romain Bioteau

Merge remote-tracking branch 'origin/master' into DataManagement

Conflicts:
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/store/AbstractEMFRepositoryStore.java
parents 0b8ab89a ef9a7f26

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -19,5 +19,5 @@
<target name="p2AllInOne">
<P2AllInOneBundleInfo installLocation="${root.dir}" />
</target>
</target>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bonitasoft.studio.bundles</groupId>
<artifactId>features</artifactId>
<version>6.3.0-SNAPSHOT</version>
</parent>
<groupId>org.bonitasoft.studio.bundles.features</groupId>
<artifactId>bos-branding-feature</artifactId>
<version>6.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bonitasoft.studio.bundles</groupId>
<artifactId>features</artifactId>
<version>6.3.0-SNAPSHOT</version>
</parent>
<groupId>org.bonitasoft.studio.bundles.features</groupId>
<artifactId>bos-branding-feature</artifactId>
<version>6.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>platform-specific-feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>platform-specific-feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>rootfiles-feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>rootfiles-feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
/generationWorkspace
/generationWorkspace
eclipse.preferences.version=1
generate_rcp=false
ignore_gmfgen_validation=false
ignore_mapmodel_validation=false
use_in_transfo_code_gen=true