upstream/oracle/userland-gate: components/meld/meld.p5m@03ec35f09e5b (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	#
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	21	# Copyright (c) 2011, 2015, 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>
3778 35735ffdda43 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: 3734 diff changeset	25	<transform file hardlink path=usr/lib/.*\.py$ -> default pkg.tmp.pyversion 2.X>
35735ffdda43 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: 3734 diff changeset	26	#
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	27	set name=pkg.fmri \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	28	value=pkg:/developer/meld@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	29	set name=pkg.summary value="meld - graphical diff and merge tool"
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	30	set name=pkg.description \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	31	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."
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	32	set name=com.oracle.info.description \
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	33	value="the meld graphical diff and merge tool"
3661 47545fb8aed4 18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests John Beck <John.Beck@Oracle.COM> parents: 3225 diff changeset	34	set name=com.oracle.info.tpno value=$(TPNO)
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	35	set name=info.classification \
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	36	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	37	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	38	set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	39	set name=org.opensolaris.arc-caseid value=PSARC/2008/189
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	40	set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	41	dir path=usr
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	42	dir path=usr/bin
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	43	file path=usr/bin/meld \
3984 03ec35f09e5b 20663199 six Userland components need work for Python 2.6 -> 2.7 move John Beck <John.Beck@Oracle.COM> parents: 3778 diff changeset	44	pkg.depend.runpath=/usr/lib/meld:/usr/lib/python$(PYVER):/usr/lib/python$(PYVER)/vendor-packages/gtk-2.0 \
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	45	pkg.depend.bypass-generate=./checker. \
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	46	pkg.depend.bypass-generate=./pychecker/__init__. \
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	47	pkg.depend.bypass-generate=./pygtk.
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	48	dir path=usr/lib
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	49	dir path=usr/lib/meld
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	50	dir path=usr/lib/meld/meld
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	51	file path=usr/lib/meld/meld/__init__.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	52	file path=usr/lib/meld/meld/diffmap.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	53	file path=usr/lib/meld/meld/diffutil.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	54	file path=usr/lib/meld/meld/dirdiff.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	55	file path=usr/lib/meld/meld/filediff.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	56	file path=usr/lib/meld/meld/filemerge.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	57	file path=usr/lib/meld/meld/matchers.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	58	file path=usr/lib/meld/meld/meldapp.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	59	file path=usr/lib/meld/meld/melddoc.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	60	file path=usr/lib/meld/meld/merge.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	61	file path=usr/lib/meld/meld/misc.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	62	file path=usr/lib/meld/meld/paths.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	63	file path=usr/lib/meld/meld/preferences.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	64	file path=usr/lib/meld/meld/task.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	65	file path=usr/lib/meld/meld/tree.py
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	66	dir path=usr/lib/meld/meld/ui
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	67	file path=usr/lib/meld/meld/ui/__init__.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	68	file path=usr/lib/meld/meld/ui/findbar.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	69	file path=usr/lib/meld/meld/ui/gnomeglade.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	70	file path=usr/lib/meld/meld/ui/historyentry.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	71	file path=usr/lib/meld/meld/ui/msgarea.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	72	file path=usr/lib/meld/meld/ui/notebooklabel.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	73	file path=usr/lib/meld/meld/ui/wraplabel.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	74	file path=usr/lib/meld/meld/undo.py
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	75	dir path=usr/lib/meld/meld/util
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	76	file path=usr/lib/meld/meld/util/__init__.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	77	file path=usr/lib/meld/meld/util/prefs.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	78	file path=usr/lib/meld/meld/util/sourceviewer.py
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	79	dir path=usr/lib/meld/meld/vc
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	80	file path=usr/lib/meld/meld/vc/__init__.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	81	file path=usr/lib/meld/meld/vc/_null.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	82	file path=usr/lib/meld/meld/vc/_vc.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	83	file path=usr/lib/meld/meld/vc/bzr.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	84	file path=usr/lib/meld/meld/vc/cdv.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	85	file path=usr/lib/meld/meld/vc/cvs.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	86	file path=usr/lib/meld/meld/vc/darcs.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	87	file path=usr/lib/meld/meld/vc/git.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	88	file path=usr/lib/meld/meld/vc/mercurial.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	89	file path=usr/lib/meld/meld/vc/monotone.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	90	file path=usr/lib/meld/meld/vc/rcs.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	91	file path=usr/lib/meld/meld/vc/svk.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	92	file path=usr/lib/meld/meld/vc/svn.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	93	file path=usr/lib/meld/meld/vc/tla.py
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	94	file path=usr/lib/meld/meld/vcview.py
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	95	dir path=usr/share
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	96	dir path=usr/share/applications
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	97	file path=usr/share/applications/meld.desktop
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	98	dir path=usr/share/gnome group=other
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	99	dir path=usr/share/gnome/help
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	100	dir path=usr/share/gnome/help/meld
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	101	dir path=usr/share/gnome/help/meld/C
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	102	file path=usr/share/gnome/help/meld/C/meld.xml
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	103	dir path=usr/share/gnome/help/meld/es
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	104	file path=usr/share/gnome/help/meld/es/meld.xml
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	105	dir path=usr/share/gnome/help/meld/fr
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	106	file path=usr/share/gnome/help/meld/fr/meld.xml
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	107	dir path=usr/share/icons
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	108	dir path=usr/share/icons/hicolor
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	109	dir path=usr/share/icons/hicolor/16x16
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	110	dir path=usr/share/icons/hicolor/16x16/apps
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	111	file path=usr/share/icons/hicolor/16x16/apps/meld.png
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	112	dir path=usr/share/icons/hicolor/22x22
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	113	dir path=usr/share/icons/hicolor/22x22/apps
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	114	file path=usr/share/icons/hicolor/22x22/apps/meld.png
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	115	dir path=usr/share/icons/hicolor/32x32
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	116	dir path=usr/share/icons/hicolor/32x32/apps
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	117	file path=usr/share/icons/hicolor/32x32/apps/meld.png
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	118	dir path=usr/share/icons/hicolor/48x48
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	119	dir path=usr/share/icons/hicolor/48x48/apps
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	120	file path=usr/share/icons/hicolor/48x48/apps/meld.png
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	121	dir path=usr/share/icons/hicolor/scalable
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	122	dir path=usr/share/icons/hicolor/scalable/apps
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	123	file path=usr/share/icons/hicolor/scalable/apps/meld.svg
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	124	dir path=usr/share/locale
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	125	dir path=usr/share/locale/ar
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	126	dir path=usr/share/locale/ar/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	127	file path=usr/share/locale/ar/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	128	dir path=usr/share/locale/bg
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	129	dir path=usr/share/locale/bg/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	130	file path=usr/share/locale/bg/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	131	dir path=usr/share/locale/ca
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	132	dir path=usr/share/locale/ca/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	133	file path=usr/share/locale/ca/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	134	dir path=usr/share/locale/cs
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	135	dir path=usr/share/locale/cs/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	136	file path=usr/share/locale/cs/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	137	dir path=usr/share/locale/de
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	138	dir path=usr/share/locale/de/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	139	file path=usr/share/locale/de/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	140	dir path=usr/share/locale/dz
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	141	dir path=usr/share/locale/dz/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	142	file path=usr/share/locale/dz/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	143	dir path=usr/share/locale/el
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	144	dir path=usr/share/locale/el/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	145	file path=usr/share/locale/el/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	146	dir path=usr/share/locale/en_CA
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	147	dir path=usr/share/locale/en_CA/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	148	file path=usr/share/locale/en_CA/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	149	dir path=usr/share/locale/en_GB
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	150	dir path=usr/share/locale/en_GB/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	151	file path=usr/share/locale/en_GB/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	152	dir path=usr/share/locale/es
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	153	dir path=usr/share/locale/es/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	154	file path=usr/share/locale/es/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	155	dir path=usr/share/locale/fi
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	156	dir path=usr/share/locale/fi/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	157	file path=usr/share/locale/fi/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	158	dir path=usr/share/locale/fr
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	159	dir path=usr/share/locale/fr/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	160	file path=usr/share/locale/fr/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	161	dir path=usr/share/locale/gl
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	162	dir path=usr/share/locale/gl/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	163	file path=usr/share/locale/gl/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	164	dir path=usr/share/locale/hu
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	165	dir path=usr/share/locale/hu/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	166	file path=usr/share/locale/hu/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	167	dir path=usr/share/locale/it
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	168	dir path=usr/share/locale/it/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	169	file path=usr/share/locale/it/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	170	dir path=usr/share/locale/ja
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	171	dir path=usr/share/locale/ja/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	172	file path=usr/share/locale/ja/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	173	dir path=usr/share/locale/ko
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	174	dir path=usr/share/locale/ko/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	175	file path=usr/share/locale/ko/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	176	dir path=usr/share/locale/nb
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	177	dir path=usr/share/locale/nb/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	178	file path=usr/share/locale/nb/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	179	dir path=usr/share/locale/ne
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	180	dir path=usr/share/locale/ne/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	181	file path=usr/share/locale/ne/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	182	dir path=usr/share/locale/nl
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	183	dir path=usr/share/locale/nl/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	184	file path=usr/share/locale/nl/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	185	dir path=usr/share/locale/oc
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	186	dir path=usr/share/locale/oc/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	187	file path=usr/share/locale/oc/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	188	dir path=usr/share/locale/pa
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	189	dir path=usr/share/locale/pa/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	190	file path=usr/share/locale/pa/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	191	dir path=usr/share/locale/pt
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	192	dir path=usr/share/locale/pt/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	193	file path=usr/share/locale/pt/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	194	dir path=usr/share/locale/pt_BR
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	195	dir path=usr/share/locale/pt_BR/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	196	file path=usr/share/locale/pt_BR/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	197	dir path=usr/share/locale/ru
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	198	dir path=usr/share/locale/ru/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	199	file path=usr/share/locale/ru/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	200	dir path=usr/share/locale/rw
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	201	dir path=usr/share/locale/rw/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	202	file path=usr/share/locale/rw/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	203	dir path=usr/share/locale/sl
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	204	dir path=usr/share/locale/sl/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	205	file path=usr/share/locale/sl/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	206	dir path=usr/share/locale/sq
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	207	dir path=usr/share/locale/sq/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	208	file path=usr/share/locale/sq/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	209	dir path=usr/share/locale/sr
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	210	dir path=usr/share/locale/sr/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	211	file path=usr/share/locale/sr/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	212	dir path=usr/share/locale/sr@latin
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	213	dir path=usr/share/locale/sr@latin/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	214	file path=usr/share/locale/sr@latin/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	215	dir path=usr/share/locale/sv
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	216	dir path=usr/share/locale/sv/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	217	file path=usr/share/locale/sv/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	218	dir path=usr/share/locale/vi
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	219	dir path=usr/share/locale/vi/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	220	file path=usr/share/locale/vi/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	221	dir path=usr/share/locale/zh_CN
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	222	dir path=usr/share/locale/zh_CN/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	223	file path=usr/share/locale/zh_CN/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	224	dir path=usr/share/locale/zh_TW
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	225	dir path=usr/share/locale/zh_TW/LC_MESSAGES
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	226	file path=usr/share/locale/zh_TW/LC_MESSAGES/meld.mo
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	227	dir path=usr/share/man
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	228	dir path=usr/share/man/man1
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	229	file meld.1 path=usr/share/man/man1/meld.1
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	230	dir path=usr/share/meld
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	231	dir path=usr/share/meld/icons
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	232	file path=usr/share/meld/icons/button_apply0.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	233	file path=usr/share/meld/icons/button_apply1.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	234	file path=usr/share/meld/icons/button_copy0.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	235	file path=usr/share/meld/icons/button_copy1.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	236	file path=usr/share/meld/icons/button_delete.xpm
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	237	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	238	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	239	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	240	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	241	file path=usr/share/meld/icons/icon.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	242	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	243	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	244	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	245	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	246	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	247	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	248	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	249	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	250	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	251	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	252	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	253	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	254	file path=usr/share/meld/icons/vc-icon.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	255	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	256	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	257	file path=usr/share/meld/icons/vc-update-24.png
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	258	dir path=usr/share/meld/ui
227 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
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	269	dir path=usr/share/omf
24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	270	dir path=usr/share/omf/meld
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	271	file path=usr/share/omf/meld/meld-C.omf
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	272	file path=usr/share/omf/meld/meld-es.omf
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	273	file path=usr/share/omf/meld/meld-fr.omf
3734 24181f5eb463 20440737 pkgfmt all Userland pkg(5) manifests John Beck <John.Beck@Oracle.COM> parents: 3661 diff changeset	274	dir path=usr/share/pixmaps
227 1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	275	file path=usr/share/pixmaps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland Kevin Crowe <Kevin.Crowe@oracle.com> parents: diff changeset	276	license meld.license license=GPLv2

author	John Beck <John.Beck@Oracle.COM>
	Wed, 18 Mar 2015 13:27:20 -0700
branch	s11-update
changeset 3984	03ec35f09e5b
parent 3778	35735ffdda43
child 7869	a80ad5071d35
permissions	-rw-r--r--