[sword-svn] r2995 - in branches/sword-1-7-x: . doc include src/modules/filters

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2013-12-27 23:32:26 -0700 (Fri, 27 Dec 2013)
New Revision: 2995

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/CMakeLists.txt
   branches/sword-1-7-x/configure.ac
   branches/sword-1-7-x/doc/Doxyfile
   branches/sword-1-7-x/include/osisreferencelinks.h
   branches/sword-1-7-x/src/modules/filters/osisreferencelinks.cpp
Log:
Merging changes compatible for 1.7.1.



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:2989-2991

Modified: branches/sword-1-7-x/CMakeLists.txt
===================================================================
--- branches/sword-1-7-x/CMakeLists.txt	2013-12-28 05:54:40 UTC (rev 2994)
+++ branches/sword-1-7-x/CMakeLists.txt	2013-12-28 06:32:26 UTC (rev 2995)
@@ -15,7 +15,7 @@
 # A CMake port of the SWORD build system... we hope
 PROJECT(libsword CXX C)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-SET(SWORD_VERSION 1.7.0)
+SET(SWORD_VERSION 1.7.1)
 
 # Make sure it's an out-of-stream build
 IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})

Modified: branches/sword-1-7-x/configure.ac
===================================================================
--- branches/sword-1-7-x/configure.ac	2013-12-28 05:54:40 UTC (rev 2994)
+++ branches/sword-1-7-x/configure.ac	2013-12-28 06:32:26 UTC (rev 2995)
@@ -5,7 +5,7 @@
 # Version change: Change line 8 only !
 # Change it immediately after a release
 
-AC_INIT(sword, 1.7.0, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
+AC_INIT(sword, 1.7.1, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
 AC_CONFIG_SRCDIR(sword.bmp)
 AC_PREREQ(2.52)
 AC_REVISION($Revision: 1.45 $)

Modified: branches/sword-1-7-x/doc/Doxyfile
===================================================================
--- branches/sword-1-7-x/doc/Doxyfile	2013-12-28 05:54:40 UTC (rev 2994)
+++ branches/sword-1-7-x/doc/Doxyfile	2013-12-28 06:32:26 UTC (rev 2995)
@@ -55,7 +55,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER = "1.7.0"
+PROJECT_NUMBER = "1.7.1"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 


Property changes on: branches/sword-1-7-x/include/osisreferencelinks.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id
Added: svn:eol-style
   + native


Property changes on: branches/sword-1-7-x/src/modules/filters/osisreferencelinks.cpp
___________________________________________________________________
Added: svn:keywords
   + Author Date Id
Added: svn:eol-style
   + native