Merge branch 'jonreid-master' + fix merge conflict

Conflicts:
	envcov.sh

Author: designatednerd

LICENSE.txt

@@ -1,5 +1,5 @@
+XcodeCoverage by Jon Reid, http://qualitycoding/about/
 Copyright 2014 Jonathan M. Reid
-All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

cleancov

@@ -1,9 +1,6 @@
 #!/bin/sh
-#
+#   XcodeCoverage by Jon Reid, http://qualitycoding/about/
 #   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
-#   Created by: Jon Reid, http://qualitycoding.org/
-#   Source: https://github.com/jonreid/XcodeCoverage
-#
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source ${DIR}/envcov.sh

envcov.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 #
+#   XcodeCoverage by Jon Reid, http://qualitycoding/about/
 #   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
-#   Created by: Jon Reid, http://qualitycoding.org/
-#   Source: https://github.com/jonreid/XcodeCoverage
-#
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ENV_DIR="${DIR}"

exportenv.sh

@@ -1,8 +1,5 @@
-#
+#   XcodeCoverage by Jon Reid, http://qualitycoding/about/
 #   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
-#   Created by: Jon Reid, http://qualitycoding.org/
-#   Source: https://github.com/jonreid/XcodeCoverage
-#
 
 DIR="${SRCROOT}"
 export | egrep '( BUILT_PRODUCTS_DIR)|(CURRENT_ARCH)|(OBJECT_FILE_DIR_normal)|(SRCROOT)|(OBJROOT)' > ${DIR}/env.sh

getcov

@@ -1,9 +1,6 @@
 #!/bin/sh
-#
+#   XcodeCoverage by Jon Reid, http://qualitycoding/about/
 #   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
-#   Created by: Jon Reid, http://qualitycoding.org/
-#   Source: https://github.com/jonreid/XcodeCoverage
-#
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${DIR}/envcov.sh"

llvm-cov-wrapper.sh

@@ -1,9 +1,6 @@
 #!/bin/sh
-#
+#   XcodeCoverage by Jon Reid, http://qualitycoding/about/
 #   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
-#   Created by: Jon Reid, http://qualitycoding.org/
-#   Source: https://github.com/jonreid/XcodeCoverage
-#
 
 if [ "$1" = "-v" ]; then
     echo "llvm-cov-wrapper 4.2.1"

run_code_coverage_post.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+#   XcodeCoverage by Jon Reid, http://qualitycoding/about/
+#   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
+
 button=`/usr/bin/osascript <<EOT
 tell application "Finder"
   activate