Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

Conflicts:
	src/include/report/event_config.h

1 files changed, 24 insertions, 1 deletions

diff --git a/src/include/report/event_config.h b/src/include/report/event_config.h
index 3d05a2c9..c383bce4 100644
--- a/src/include/report/event_config.h
+++ b/src/include/report/event_config.h
@@ -1,5 +1,26 @@
+/*
+    Copyright (C) 2011  ABRT team
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #include <glib.h>
 
+#ifndef EVENT_CONFIG_H
+#define EVENT_CONFIG_H
+
 typedef enum
 {
     OPTION_TYPE_TEXT,
@@ -48,4 +69,6 @@ void load_event_config_data(void);
 void free_event_config_data(void);
 event_config_t *get_event_config(const char *name);
 
-extern GHashTable *g_event_config_list;   // for iterating through entire list of all loaded configs
\ No newline at end of file
+extern GHashTable *g_event_config_list;   // for iterating through entire list of all loaded configs
+
+#endif