Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

phpmyadmin · Nov 5, 2014 · ad8ed1d · ad8ed1d
2 parents 403c9d2 + d8c7d8f
commit ad8ed1d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build.xml b/build.xml
@@ -120,7 +120,7 @@
 
  <target name="jshint" description="Javascript checks">
   <apply executable="jshint" output="${basedir}/build/logs/jslint.xml"  parallel="true">
-   <arg line="--config ./.jshintrc --jslint-reporter" />
+   <arg line="--config ./.jshintrc --reporter=checkstyle" />
    <fileset dir="${basedir}">
     <include name="js/pmd/*.js" />
     <include name="js/*.js" />