From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster
---
make-rules/ips-buildinfo.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/make-rules/ips-buildinfo.mk b/make-rules/ips-buildinfo.mk
index 247d38a..4cb0bd9 100644
--- a/make-rules/ips-buildinfo.mk
+++ b/make-rules/ips-buildinfo.mk
@@ -61,7 +61,7 @@
# the development build) of the Solaris Update is being built.
# This is set by the gatekeepers.
#
-BUILDID ?= 21
+BUILDID ?= 23
# Each (nightly) build of the code that produces packages needs to
# be uniquely identified so that packages produced by different
@@ -72,7 +72,7 @@
#
#NIGHTLYID ?= $(shell hg tip --template '{rev}\n')
#
-NIGHTLYID ?= 1
+NIGHTLYID ?= 0
#
# Branch Identifier. Used in the version section of the package name to
--
Gitblit v1.9.3