From f7e5d2b46b03cc4bc09c38f7e0873378bb9c3b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 21 Jun 2015 07:55:15 +0200
Subject: Imported Upstream version 2.3.5

---
 doc/user/mergeflags.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/user/mergeflags.xml')

diff --git a/doc/user/mergeflags.xml b/doc/user/mergeflags.xml
index 615724a..edd9850 100644
--- a/doc/user/mergeflags.xml
+++ b/doc/user/mergeflags.xml
@@ -21,7 +21,7 @@
 
 <!--
 
-  Copyright (c) 2001 - 2014 The SCons Foundation
+  Copyright (c) 2001 - 2015 The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
-- 
cgit v1.2.3