[sword-svn] r2946 - trunk

[scribe at crosswire.org]

Author: scribe
Date: 2013-08-03 02:52:44 -0700 (Sat, 03 Aug 2013)
New Revision: 2946

Modified:
   trunk/CMakeLists.txt
   trunk/ChangeLog
   trunk/configure.ac
Log:
some updates to changelog
prep for 1.7.0RC2


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-08-03 09:44:39 UTC (rev 2945)
+++ trunk/CMakeLists.txt	2013-08-03 09:52:44 UTC (rev 2946)
@@ -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.6.901)
+SET(SWORD_VERSION 1.6.902)
 
 # Make sure it's an out-of-stream build
 IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2013-08-03 09:44:39 UTC (rev 2945)
+++ trunk/ChangeLog	2013-08-03 09:52:44 UTC (rev 2946)
@@ -34,7 +34,7 @@
 29-Jun=2013	Chris Little <chrislit at crosswire.org>
 	removed PLAINHTML and PLAINFootnotes filters
 
-19-Jun-2013 Gregory S. Hellings <greg.hellings at gmail.com>
+19-Jun-2013	Gregory S. Hellings <greg.hellings at gmail.com>
 	Introduced CMake options to specify exact install locations
 		of subcomponents
 
@@ -78,11 +78,6 @@
 	Greatly improved navigation with intros and normalization turned
 		on/off
 
-------------------------------------------------------------------------
-r2783 | dmsmith | 2013-02-18 17:56:43 +0100 (Mon, 18 Feb 2013) | 1 line
-
-treat \n as a space and don't introduce space
-
 1-Feb-2013	Troy A. Griffitts <scribe at crosswire.org>
 	New .conf entries honored:
 		StrongsPadding=false, which turns off
@@ -92,7 +87,7 @@
 29-Jan-2013	Jaak Ristioja <jaak at ristioja.ee>
 	Removed warnings in header files for unused variables
 
-06-Jan-2013 Gregory S. Hellings <greg.hellings at gmail.com>
+06-Jan-2013	Gregory S. Hellings <greg.hellings at gmail.com>
 	Added support to install from SFTP sources using username/password
 		authentication in places where cURL has SFTP support (no support
 		for public-key auth yet)
@@ -119,7 +114,7 @@
 14-Sep-2012	Troy A. Griffitts <scribe at crosswire.org>
 	Changed default log level to WARN from INFO
 
-29-Aug-2012 Gregory S. Hellings <greg.hellings at gmail.com>
+29-Aug-2012	Gregory S. Hellings <greg.hellings at gmail.com>
 	Swig bindings may now be built against shared or static libraries.
 	Cleaned up almost all gcc 4.7 warnings from the swig bindings and
 		eliminated errors which packagers had discovered.
@@ -136,7 +131,7 @@
 
 
 ------------------------------------------------------------------------
-25-Apr-2012 Gregory S. Hellings <greg.hellings at gmail.com>
+25-Apr-2012	Gregory S. Hellings <greg.hellings at gmail.com>
 	InstallMgr now supports HTTPS connections where cURL has support
 		for that transport
 
@@ -156,20 +151,17 @@
 		MODTYPE_GENBOOKS, MODTYPE_DAILYDEVOS
 
 ------------------------------------------------------------------------
-14-Feb-2012 Gregory S. Hellings <greg.hellings at gmail.com>
+14-Feb-2012	Gregory S. Hellings <greg.hellings at gmail.com>
 	Added cross-compile support to CMake, including sample Toolchain files.
 
-------------------------------------------------------------------------
-r2677 | charcoal | 2012-02-13 02:48:36 +0100 (Mon, 13 Feb 2012) | 1 line
+13-Feb-2012	Karl Kleinpaste <karl at kleinpaste.org>
+	Added ability for *HTML* wrappers to render n attribute from notes
 
-add setRenderNoteNumbers to get n=X content attached to *n/*x
 ------------------------------------------------------------------------
 r2676 | mdbergmann | 2012-01-30 19:56:15 +0100 (Mon, 30 Jan 2012) | 1 line
 
 update to Lion Project. All SWORD utils are now in Xcode project and can be built from there. They are however prepared to be used from with Eloquent.
 
-------------------------------------------------------------------------
-r2672 | chrislit | 2011-12-07 07:40:36 +0100 (Wed, 07 Dec 2011) | 1 line
 07-Dec-2011	Chris Little <chrislit at crosswire.org>
 	removed SynodalP v11n from library
 
@@ -178,7 +170,7 @@
 
 re-added the preverse div markers
 ------------------------------------------------------------------------
-02-Nov-2011 Gregory S. Hellings <greg.hellings at gmail.com>
+02-Nov-2011	Gregory S. Hellings <greg.hellings at gmail.com>
 	Improved handling of CLucene and included support for CLucene 2
 
 29-Oct-2011	Troy A. Griffitts <scribe at crosswire.org>
@@ -202,7 +194,7 @@
 readded ppc archiecture for Xcode project.
 
 
-14-Jul-2011 Gregory S. Hellings <greg.hellings at gmail.com>
+14-Jul-2011	Gregory S. Hellings <greg.hellings at gmail.com>
 	Added a sample Python script that demonstrates the bindings and compares
 		osisIDs in an XML file to known Versification schemes
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2013-08-03 09:44:39 UTC (rev 2945)
+++ trunk/configure.ac	2013-08-03 09:52:44 UTC (rev 2946)
@@ -5,7 +5,7 @@
 # Version change: Change line 8 only !
 # Change it immediately after a release
 
-AC_INIT(sword, 1.6.901, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
+AC_INIT(sword, 1.6.902, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
 AC_CONFIG_SRCDIR(sword.bmp)
 AC_PREREQ(2.52)
 AC_REVISION($Revision: 1.45 $)