From 44a3a78fb6a3863c0c7f3c1193837337e68a67e4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Nov 2008 23:24:08 -0600
Subject: Merge from fe-moved

(bzr r6891)
---
 src/dialogs/object-attributes.cpp | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'src/dialogs/object-attributes.cpp')

diff --git a/src/dialogs/object-attributes.cpp b/src/dialogs/object-attributes.cpp
index e0c891ea1..d9bcf1489 100644
--- a/src/dialogs/object-attributes.cpp
+++ b/src/dialogs/object-attributes.cpp
@@ -1,9 +1,7 @@
-#define __SP_OBJECT_ATTRIBUTES_C__
-
-/**
- * \brief  Generic properties editor
- *
- * Authors:
+/** @file
+ * @brief  Generic properties editor
+ */
+/* Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   bulia byak <buliabyak@users.sf.net>
  *
@@ -12,10 +10,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <glibmm/i18n.h>
 #include <string>
 #include <cstring>
@@ -149,11 +143,8 @@ sp_object_attributes_dialog (SPObject *object, const gchar *tag)
             sp_object_attr_show_dialog (object, image_desc, tag);
         }
     } 
-
 } // end of sp_object_attributes_dialog()
 
-
-
 /*
   Local Variables:
   mode:c++
-- 
cgit v1.2.3