upstream/oracle/userland-gate: components/meld/meld.p5m@0391c5c3b137 (annotated)

227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	1	#
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	2	# CDDL HEADER START
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	3	#
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	4	# The contents of this file are subject to the terms of the
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	5	# Common Development and Distribution License (the "License").
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	6	# You may not use this file except in compliance with the License.
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	7	#
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	8	# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	9	# or http://www.opensolaris.org/os/licensing.
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	10	# See the License for the specific language governing permissions
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	11	# and limitations under the License.
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	12	#
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	13	# When distributing Covered Code, include this CDDL HEADER in each
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	14	# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	15	# If applicable, add the following below this CDDL HEADER, with the
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	16	# fields enclosed by brackets "[]" replaced with your own identifying
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	17	# information: Portions Copyright [yyyy] [name of copyright owner]
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	18	#
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	19	# CDDL HEADER END
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	20	#
2551 0391c5c3b137 16431724 Adjust how license text and Oracle internal tracking numbers are propagated Rich Burridge <rich.burridge@oracle.com> parents: 2378 diff changeset	21	# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	22	#
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	23
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	24	<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	25	set name=pkg.fmri \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	26	value=pkg:/developer/meld@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	27	set name=pkg.description \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	28	value="Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial."
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	29	set name=pkg.summary value="meld - graphical diff and merge tool"
2551 0391c5c3b137 16431724 Adjust how license text and Oracle internal tracking numbers are propagated Rich Burridge <rich.burridge@oracle.com> parents: 2378 diff changeset	30	set name=com.oracle.info.description value="the meld graphical diff and merge tool"
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	31	set name=info.classification \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	32	value="org.opensolaris.category.2008:Applications/System Utilities"
464 08f94c414553 7073736 need to turn _ into - Mike Sullivan <Mike.Sullivan@Oracle.COM> parents: 227 diff changeset	33	set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
609 775168282b2f 7037821 Userland migration of data from Makefile to manifest may have been a little overzealous Rich Burridge <rich.burridge@oracle.com> parents: 587 diff changeset	34	set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
464 08f94c414553 7073736 need to turn _ into - Mike Sullivan <Mike.Sullivan@Oracle.COM> parents: 227 diff changeset	35	set name=org.opensolaris.arc-caseid \
2378 f8a11e1fa6ac 7184693 Many Userland components have incorrect org.opensolaris.arc-caseid actions Rich Burridge <rich.burridge@oracle.com> parents: 629 diff changeset	36	value=PSARC/2008/189
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	37	set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	38	dir path=usr
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	39	dir path=usr/bin
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	40	dir path=usr/lib
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	41	dir path=usr/lib/meld
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	42	dir path=usr/lib/meld/meld
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	43	dir path=usr/lib/meld/meld/ui
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	44	dir path=usr/lib/meld/meld/util
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	45	dir path=usr/lib/meld/meld/vc
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	46	dir path=usr/share
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	47	dir path=usr/share/applications
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	48	dir path=usr/share/gnome group=other
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	49	dir path=usr/share/gnome/help
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	50	dir path=usr/share/gnome/help/meld
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	51	dir path=usr/share/gnome/help/meld/C
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	52	dir path=usr/share/gnome/help/meld/es
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	53	dir path=usr/share/gnome/help/meld/fr
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	54	dir path=usr/share/icons
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	55	dir path=usr/share/icons/hicolor
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	56	dir path=usr/share/icons/hicolor/16x16
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	57	dir path=usr/share/icons/hicolor/16x16/apps
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	58	dir path=usr/share/icons/hicolor/22x22
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	59	dir path=usr/share/icons/hicolor/22x22/apps
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	60	dir path=usr/share/icons/hicolor/32x32
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	61	dir path=usr/share/icons/hicolor/32x32/apps
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	62	dir path=usr/share/icons/hicolor/48x48
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	63	dir path=usr/share/icons/hicolor/48x48/apps
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	64	dir path=usr/share/icons/hicolor/scalable
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	65	dir path=usr/share/icons/hicolor/scalable/apps
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	66	dir path=usr/share/locale
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	67	dir path=usr/share/locale/ar
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	68	dir path=usr/share/locale/ar/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	69	dir path=usr/share/locale/bg
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	70	dir path=usr/share/locale/bg/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	71	dir path=usr/share/locale/ca
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	72	dir path=usr/share/locale/ca/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	73	dir path=usr/share/locale/cs
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	74	dir path=usr/share/locale/cs/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	75	dir path=usr/share/locale/de
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	76	dir path=usr/share/locale/de/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	77	dir path=usr/share/locale/dz
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	78	dir path=usr/share/locale/dz/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	79	dir path=usr/share/locale/el
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	80	dir path=usr/share/locale/el/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	81	dir path=usr/share/locale/en_CA
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	82	dir path=usr/share/locale/en_CA/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	83	dir path=usr/share/locale/en_GB
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	84	dir path=usr/share/locale/en_GB/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	85	dir path=usr/share/locale/es
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	86	dir path=usr/share/locale/es/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	87	dir path=usr/share/locale/fi
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	88	dir path=usr/share/locale/fi/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	89	dir path=usr/share/locale/fr
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	90	dir path=usr/share/locale/fr/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	91	dir path=usr/share/locale/gl
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	92	dir path=usr/share/locale/gl/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	93	dir path=usr/share/locale/hu
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	94	dir path=usr/share/locale/hu/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	95	dir path=usr/share/locale/it
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	96	dir path=usr/share/locale/it/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	97	dir path=usr/share/locale/ja
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	98	dir path=usr/share/locale/ja/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	99	dir path=usr/share/locale/ko
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	100	dir path=usr/share/locale/ko/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	101	dir path=usr/share/locale/nb
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	102	dir path=usr/share/locale/nb/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	103	dir path=usr/share/locale/ne
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	104	dir path=usr/share/locale/ne/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	105	dir path=usr/share/locale/nl
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	106	dir path=usr/share/locale/nl/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	107	dir path=usr/share/locale/oc
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	108	dir path=usr/share/locale/oc/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	109	dir path=usr/share/locale/pa
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	110	dir path=usr/share/locale/pa/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	111	dir path=usr/share/locale/pt
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	112	dir path=usr/share/locale/pt/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	113	dir path=usr/share/locale/pt_BR
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	114	dir path=usr/share/locale/pt_BR/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	115	dir path=usr/share/locale/ru
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	116	dir path=usr/share/locale/ru/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	117	dir path=usr/share/locale/rw
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	118	dir path=usr/share/locale/rw/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	119	dir path=usr/share/locale/sl
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	120	dir path=usr/share/locale/sl/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	121	dir path=usr/share/locale/sq
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	122	dir path=usr/share/locale/sq/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	123	dir path=usr/share/locale/sr
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	124	dir path=usr/share/locale/sr/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	125	dir path=usr/share/locale/sr@latin
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	126	dir path=usr/share/locale/sr@latin/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	127	dir path=usr/share/locale/sv
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	128	dir path=usr/share/locale/sv/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	129	dir path=usr/share/locale/vi
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	130	dir path=usr/share/locale/vi/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	131	dir path=usr/share/locale/zh_CN
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	132	dir path=usr/share/locale/zh_CN/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	133	dir path=usr/share/locale/zh_TW
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	134	dir path=usr/share/locale/zh_TW/LC_MESSAGES
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	135	dir path=usr/share/man
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	136	dir path=usr/share/man/man1
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	137	dir path=usr/share/meld
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	138	dir path=usr/share/meld/icons
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	139	dir path=usr/share/meld/ui
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	140	dir path=usr/share/omf
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	141	dir path=usr/share/omf/meld
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	142	dir path=usr/share/pixmaps
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	143	file path=usr/bin/meld \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	144	pkg.depend.runpath=/usr/lib/meld:/usr/lib/python2.6:/usr/lib/python2.6/vendor-packages/gtk-2.0 \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	145	pkg.depend.bypass-generate=./checker. \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	146	pkg.depend.bypass-generate=./pychecker/__init__. \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	147	pkg.depend.bypass-generate=./pygtk.
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	148	file path=usr/lib/meld/meld/__init__.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	149	file path=usr/lib/meld/meld/diffmap.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	150	file path=usr/lib/meld/meld/diffutil.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	151	file path=usr/lib/meld/meld/dirdiff.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	152	file path=usr/lib/meld/meld/filediff.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	153	file path=usr/lib/meld/meld/filemerge.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	154	file path=usr/lib/meld/meld/matchers.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	155	file path=usr/lib/meld/meld/meldapp.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	156	file path=usr/lib/meld/meld/melddoc.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	157	file path=usr/lib/meld/meld/merge.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	158	file path=usr/lib/meld/meld/misc.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	159	file path=usr/lib/meld/meld/paths.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	160	file path=usr/lib/meld/meld/preferences.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	161	file path=usr/lib/meld/meld/task.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	162	file path=usr/lib/meld/meld/tree.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	163	file path=usr/lib/meld/meld/ui/__init__.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	164	file path=usr/lib/meld/meld/ui/findbar.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	165	file path=usr/lib/meld/meld/ui/gnomeglade.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	166	file path=usr/lib/meld/meld/ui/historyentry.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	167	file path=usr/lib/meld/meld/ui/msgarea.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	168	file path=usr/lib/meld/meld/ui/notebooklabel.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	169	file path=usr/lib/meld/meld/ui/wraplabel.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	170	file path=usr/lib/meld/meld/undo.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	171	file path=usr/lib/meld/meld/util/__init__.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	172	file path=usr/lib/meld/meld/util/prefs.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	173	file path=usr/lib/meld/meld/util/sourceviewer.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	174	file path=usr/lib/meld/meld/vc/__init__.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	175	file path=usr/lib/meld/meld/vc/_null.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	176	file path=usr/lib/meld/meld/vc/_vc.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	177	file path=usr/lib/meld/meld/vc/bzr.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	178	file path=usr/lib/meld/meld/vc/cdv.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	179	file path=usr/lib/meld/meld/vc/cvs.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	180	file path=usr/lib/meld/meld/vc/darcs.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	181	file path=usr/lib/meld/meld/vc/git.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	182	file path=usr/lib/meld/meld/vc/mercurial.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	183	file path=usr/lib/meld/meld/vc/monotone.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	184	file path=usr/lib/meld/meld/vc/rcs.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	185	file path=usr/lib/meld/meld/vc/svk.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	186	file path=usr/lib/meld/meld/vc/svn.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	187	file path=usr/lib/meld/meld/vc/tla.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	188	file path=usr/lib/meld/meld/vcview.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	189	file path=usr/share/applications/meld.desktop
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	190	file path=usr/share/gnome/help/meld/C/meld.xml
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	191	file path=usr/share/gnome/help/meld/es/meld.xml
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	192	file path=usr/share/gnome/help/meld/fr/meld.xml
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	193	file path=usr/share/icons/hicolor/16x16/apps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	194	file path=usr/share/icons/hicolor/22x22/apps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	195	file path=usr/share/icons/hicolor/32x32/apps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	196	file path=usr/share/icons/hicolor/48x48/apps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	197	file path=usr/share/icons/hicolor/scalable/apps/meld.svg
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	198	file path=usr/share/locale/ar/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	199	file path=usr/share/locale/bg/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	200	file path=usr/share/locale/ca/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	201	file path=usr/share/locale/cs/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	202	file path=usr/share/locale/de/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	203	file path=usr/share/locale/dz/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	204	file path=usr/share/locale/el/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	205	file path=usr/share/locale/en_CA/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	206	file path=usr/share/locale/en_GB/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	207	file path=usr/share/locale/es/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	208	file path=usr/share/locale/fi/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	209	file path=usr/share/locale/fr/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	210	file path=usr/share/locale/gl/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	211	file path=usr/share/locale/hu/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	212	file path=usr/share/locale/it/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	213	file path=usr/share/locale/ja/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	214	file path=usr/share/locale/ko/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	215	file path=usr/share/locale/nb/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	216	file path=usr/share/locale/ne/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	217	file path=usr/share/locale/nl/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	218	file path=usr/share/locale/oc/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	219	file path=usr/share/locale/pa/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	220	file path=usr/share/locale/pt/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	221	file path=usr/share/locale/pt_BR/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	222	file path=usr/share/locale/ru/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	223	file path=usr/share/locale/rw/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	224	file path=usr/share/locale/sl/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	225	file path=usr/share/locale/sq/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	226	file path=usr/share/locale/sr/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	227	file path=usr/share/locale/sr@latin/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	228	file path=usr/share/locale/sv/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	229	file path=usr/share/locale/vi/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	230	file path=usr/share/locale/zh_CN/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	231	file path=usr/share/locale/zh_TW/LC_MESSAGES/meld.mo
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	232	file meld.1 path=usr/share/man/man1/meld.1
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	233	file path=usr/share/meld/icons/button_apply0.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	234	file path=usr/share/meld/icons/button_apply1.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	235	file path=usr/share/meld/icons/button_copy0.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	236	file path=usr/share/meld/icons/button_copy1.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	237	file path=usr/share/meld/icons/button_delete.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	238	file path=usr/share/meld/icons/filter-ignored-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	239	file path=usr/share/meld/icons/filter-modified-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	240	file path=usr/share/meld/icons/filter-nonvc-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	241	file path=usr/share/meld/icons/filter-normal-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	242	file path=usr/share/meld/icons/icon.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	243	file path=usr/share/meld/icons/tree-file-changed.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	244	file path=usr/share/meld/icons/tree-file-missing.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	245	file path=usr/share/meld/icons/tree-file-new.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	246	file path=usr/share/meld/icons/tree-file-newer.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	247	file path=usr/share/meld/icons/tree-file-normal.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	248	file path=usr/share/meld/icons/tree-folder-changed.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	249	file path=usr/share/meld/icons/tree-folder-missing.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	250	file path=usr/share/meld/icons/tree-folder-new.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	251	file path=usr/share/meld/icons/tree-folder-normal.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	252	file path=usr/share/meld/icons/vc-add-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	253	file path=usr/share/meld/icons/vc-checkout-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	254	file path=usr/share/meld/icons/vc-commit-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	255	file path=usr/share/meld/icons/vc-icon.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	256	file path=usr/share/meld/icons/vc-remove-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	257	file path=usr/share/meld/icons/vc-resolve-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	258	file path=usr/share/meld/icons/vc-update-24.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	259	file path=usr/share/meld/ui/dirdiff-ui.xml
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	260	file path=usr/share/meld/ui/dirdiff.glade
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	261	file path=usr/share/meld/ui/filediff-ui.xml
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	262	file path=usr/share/meld/ui/filediff.glade
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	263	file path=usr/share/meld/ui/findbar.glade
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	264	file path=usr/share/meld/ui/meldapp-ui.xml
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	265	file path=usr/share/meld/ui/meldapp.glade
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	266	file path=usr/share/meld/ui/preferences.glade
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	267	file path=usr/share/meld/ui/vcview-ui.xml
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	268	file path=usr/share/meld/ui/vcview.glade
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	269	file path=usr/share/omf/meld/meld-C.omf
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	270	file path=usr/share/omf/meld/meld-es.omf
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	271	file path=usr/share/omf/meld/meld-fr.omf
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	272	file path=usr/share/pixmaps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	273	license meld.license license=GPLv2

author	Rich Burridge <rich.burridge@oracle.com>
	Sat, 06 Apr 2013 08:18:24 -0700
branch	s11-update
changeset 2551	0391c5c3b137
parent 2378	f8a11e1fa6ac
child 1251	f1fb66b52f41
child 3225	7bbaa2f97cd1
permissions	-rw-r--r--