[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58116] branches/ soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_autoexec.h: repair bad merge

[Campbell Barton]

Revision: 58116
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58116
Author:   campbellbarton
Date:     2013-07-09 10:14:32 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
repair bad merge

Added Paths:
-----------
    branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_autoexec.h

Copied: branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_autoexec.h (from rev 58115, trunk/blender/source/blender/blenkernel/BKE_autoexec.h)
===================================================================
--- branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_autoexec.h	                        (rev 0)
+++ branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_autoexec.h	2013-07-09 10:14:32 UTC (rev 58116)
@@ -0,0 +1,31 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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.
+ *
+ * Contributor(s): Blender Foundation 2013
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef __BKE_AUTOEXEC_H__
+#define __BKE_AUTOEXEC_H__
+
+/** \file BKE_autoexec.h
+ *  \ingroup bke
+ */
+
+bool BKE_autoexec_match(const char *path);
+
+#endif  /* __BKE_AUTOEXEC_H__ */