merging in master

2013-08-29 15:03:23 -04:00
parent c3e6e0c041 851cdb05d6
commit 161ba170d9
18 changed files with 64 additions and 55 deletions
--- a/src/output_modules/output_modules.h
+++ b/src/output_modules/output_modules.h
@ -6,8 +6,8 @@
 * of the License at http://www.apache.org/licenses/LICENSE-2.0
 */

-#ifndef HEADER_OUTPUT_MODULES_H
-#define HEADER_OUTPUT_MODULES_H
+#ifndef OUTPUT_MODULES_H
+#define OUTPUT_MODULES_H

 #include "../state.h"
 #include "../fieldset.h"