Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20555148 conflict should be updated to version 20140723
authorRich Burridge <rich.burridge@oracle.com>
Mon, 02 Mar 2015 12:23:58 -0800
changeset 3880 408b5915875e
parent 3879 f0286c1c2714
child 3881 efdddf5fc687
20555148 conflict should be updated to version 20140723
components/conflict/Makefile file | annotate | diff | comparison | revisions
components/conflict/conflict.copyright file | annotate | diff | comparison | revisions 
--- a/components/conflict/Makefile	Mon Mar 02 10:02:56 2015 -0800
+++ b/components/conflict/Makefile	Mon Mar 02 12:23:58 2015 -0800
@@ -26,17 +26,17 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		conflict
-COMPONENT_VERSION=	20100627
-IPS_COMPONENT_VERSION=	0.2010.6.27
+COMPONENT_VERSION=	20140723
+IPS_COMPONENT_VERSION=	0.2014.7.23
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_PROJECT_URL=	http://invisible-island.net/conflict/conflict.html
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e795d7d580d2a2bb5081bcf9b0efe6d86567fd29770c60de90da7c07105bfeb9
+    sha256:2ef48ef4c3e2b26eb2de7748ff07e296de3ab7a4437540d60e1fdf321fc5c943
 COMPONENT_ARCHIVE_URL=	ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/conflict
 
-TPNO=			8338
+TPNO=			21547
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -68,7 +68,6 @@
 
 ASLR_MODE = $(ASLR_ENABLE)
 
-# common targets
 configure:	$(CONFIGURE_64)
 
 build:		$(BUILD_64)
--- a/components/conflict/conflict.copyright	Mon Mar 02 10:02:56 2015 -0800
+++ b/components/conflict/conflict.copyright	Mon Mar 02 12:23:58 2015 -0800
@@ -1,4 +1,4 @@
-Copyright 1995-2004,2010 by Thomas E. Dickey
+Copyright 1995-2013,2014 by Thomas E. Dickey
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
upstream/oracle/userland-gate