head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2;
locks; strict;
comment	@// @;


1.2
date	2012.08.31.13.43.30;	author adam;	state dead;
branches;
next	1.1;

1.1
date	2012.08.30.16.24.49;	author adam;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Use boost-headers-1.51.0nb1 instead of this patch
@
text
@$NetBSD: patch-src_image.cpp,v 1.1 2012/08/30 16:24:49 adam Exp $

Fix compiling with boost-1.51.0

--- src/image.cpp.orig	2012-08-29 23:53:27.000000000 +0000
+++ src/image.cpp
@@@@ -349,7 +349,7 @@@@ size_t hash_value(const locator::value& 
 	using boost::hash_value;
 	using boost::hash_combine;
 
-	size_t hash = hash_value(val.type_);
+	size_t hash = hash_value((int)val.type_);
 	if (val.type_ == locator::FILE || val.type_ == locator::SUB_FILE) {
 		hash_combine(hash, val.filename_);
 	}
@


1.1
log
@Changes 1.10.4:

This is a bugfix release for the 1.10.x series and it is compatible with the other 1.10.x versions.

Since the release of 1.10.3 several smaller issues were reported. Most of those were fixed in this release. The fixes center around terrain transitions, campaign problems and some smaller user interface tweaks. Of course many translations received updates and should be more polished now.
@
text
@d1 1
a1 1
$NetBSD$
@