head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.8
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.6
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2010Q2:1.2.0.18
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.16
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.14
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.12
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.10
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.8
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.6
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.4
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.2
	cube-native-xorg-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2010.08.09.11.33.53;	author drochner;	state dead;
branches;
next	1.2;

1.2
date	2008.07.21.07.53.13;	author abs;	state Exp;
branches;
next	1.1;

1.1
date	2008.07.18.09.43.57;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.3
log
@update to 1.3.2
changes:
-Add keyboard merging, bulk change merging, auto-merge with ancestor mode
-Updates to VC support, including lots of git fixes
-UI cleanups
-bug fixes
-Translation updates
@
text
@$NetBSD: patch-aa,v 1.2 2008/07/21 07:53:13 abs Exp $

--- help/fr/GNUmakefile.orig	2008-03-31 21:44:53.000000000 +0100
+++ help/fr/GNUmakefile
@@@@ -15,9 +15,8 @@@@ all $(OMF_NAME).install : $(OMF_NAME)
 
 .PHONY : install
 install : $(OMF_NAME).install
-	-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
+	-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
 	install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml
-	install -m 644 figures/*.png $(XML_DIR_)/figures
 	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
 	-scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
 
@


1.2
log
@update meld to 1.2nb1:
Remove part of patch-aa so the installdir for help/fr/GNUmakefile is
still created.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2008/07/18 09:43:57 wiz Exp $
@


1.1
log
@Update to 1.2:

2008-06-26 meld-1.2
=======================

	* Improve tab rendering (Kai Willadsen)

	* Speedup folder comparison massively for large directories.

	* Fix crasher i18n bug (Kai Willadsen)

	* UI tweaks and cleanups (Tom Baugis, Kai Willadsen)

	* Cleanup vc library redundancy (Vincent Legoll)

	* Various version control fixes.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- help/fr/GNUmakefile.orig	2008-03-31 20:44:53.000000000 +0000
d5 1
a5 1
@@@@ -15,9 +15,7 @@@@ all $(OMF_NAME).install : $(OMF_NAME)
d10 1
@