From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Fri, 27 Jun 2008 10:46:09 +0000 (+0000)
Subject: Sync
X-Git-Tag: gridsite-core_R_1_5_10_1_dev~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=1042a0639ed92d680ee82b8f39a5587d7870eaa0;p=jra1mw.git

Sync
---

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index a25915c..911c797 100644
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,5 @@
+* Fri Jun 27 2008 Andrew McNab <Andrew.McNab@cern.ch>
+- ==== GridSite version 1.5.10 ====
 * Mon Jun 23 2008 Andrew McNab <Andrew.McNab@man.ac.uk>
 - Backport changes from 1.7.x for Apache 2.2 and 
   Debian/SL5. 
diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION
index 0bfafc7..3a207ce 100644
--- a/org.gridsite.core/VERSION
+++ b/org.gridsite.core/VERSION
@@ -1,5 +1,5 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1.5
-PATCH_VERSION=1.5.9
-DEFVERSION=010509
+PATCH_VERSION=1.5.10
+DEFVERSION=010510
 VERSION=$(PATCH_VERSION)
diff --git a/org.gridsite.core/src/gsexec.c b/org.gridsite.core/src/gsexec.c
index 122dbba..1402871 100644
--- a/org.gridsite.core/src/gsexec.c
+++ b/org.gridsite.core/src/gsexec.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include <ap_mmn.h>
+#include "ap_mmn.h"
 #if AP_MODULE_MAGIC_AT_LEAST(20051115,0)
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE