Merge branch 'master' into issue1270_account_removal

RestComm · Oct 14, 2016 · 48e7d00 · 48e7d00
2 parents ff47c1c + 7d2740c
commit 48e7d00
Show file tree

Hide file tree

Showing 200 changed files with 168 additions and 26,438 deletions.
diff --git a/restcomm/restcomm.docs/jdocbook-mobicents/.project b/restcomm/restcomm.docs/jdocbook-mobicents/.project
diff --git a/restcomm/restcomm.docs/jdocbook-mobicents/.settings/org.eclipse.jdt.core.prefs b/restcomm/restcomm.docs/jdocbook-mobicents/.settings/org.eclipse.jdt.core.prefs
diff --git a/restcomm/restcomm.docs/jdocbook-mobicents/.settings/org.eclipse.m2e.core.prefs b/restcomm/restcomm.docs/jdocbook-mobicents/.settings/org.eclipse.m2e.core.prefs
diff --git a/restcomm/restcomm.docs/jdocbook-mobicents/pom.xml b/restcomm/restcomm.docs/jdocbook-mobicents/pom.xml
diff --git a/restcomm/restcomm.docs/jdocbook-telscale/.project b/restcomm/restcomm.docs/jdocbook-telscale/.project
diff --git a/restcomm/restcomm.docs/jdocbook-telscale/.settings/org.eclipse.jdt.core.prefs b/restcomm/restcomm.docs/jdocbook-telscale/.settings/org.eclipse.jdt.core.prefs
diff --git a/restcomm/restcomm.docs/jdocbook-telscale/.settings/org.eclipse.m2e.core.prefs b/restcomm/restcomm.docs/jdocbook-telscale/.settings/org.eclipse.m2e.core.prefs
diff --git a/restcomm/restcomm.docs/jdocbook-telscale/pom.xml b/restcomm/restcomm.docs/jdocbook-telscale/pom.xml
diff --git a/restcomm/restcomm.docs/pom.xml b/restcomm/restcomm.docs/pom.xml
@@ -17,43 +17,6 @@
 		<module>sources-asciidoc</module>
 	</modules>
 
-	<!--profiles>
-		<profile>
-			<id>release</id>
-			<modules>
-				<module>sources-mobicents</module>
-				<module>sources-telscale</module>
-				<module>jdocbook-mobicents</module>
-				<module>jdocbook-telscale</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>all</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>sources-mobicents</module>
-				<module>sources-telscale</module>
-				<module>jdocbook-mobicents</module>
-				<module>jdocbook-telscale</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>mobicents</id>
-			<modules>
-				<module>sources-mobicents</module>
-				<module>jdocbook-mobicents</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>telscale</id>
-			<modules>
-				<module>sources-telscale</module>
-				<module>jdocbook-telscale</module>
-			</modules>
-		</profile>
-	</profiles-->
 	<!-- repositories -->
 	<repositories>
 		<repository>