Merge branch 'master' into lttng-luna
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Tue, 3 Sep 2013 17:41:13 +0000 (13:41 -0400)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Tue, 3 Sep 2013 17:41:13 +0000 (13:41 -0400)
Fixes a build error with the previous -luna head.

1  2 
org.eclipse.linuxtools.ctf.core.tests/pom.xml
org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml
org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml
org.eclipse.linuxtools.lttng2.core.tests/pom.xml
org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
org.eclipse.linuxtools.lttng2.ui.tests/pom.xml
org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml
org.eclipse.linuxtools.tmf.core.tests/pom.xml
org.eclipse.linuxtools.tmf.ui.tests/pom.xml
pom.xml

diff --cc pom.xml
Simple merge
This page took 0.035469 seconds and 5 git commands to generate.