summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2007-06-10 17:13:46 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2007-06-10 17:13:46 +0000
commit5db5e0307f7cd387389ddc5075eb0aa42838f065 (patch)
treefe22f7bfd80591626e08981f9d1244ffa3beaef6
parent0996aa4989ab30144c7f19c0f9eec836ffc84f9b (diff)
downloadbitbake-5db5e0307f7cd387389ddc5075eb0aa42838f065.tar.gz
Update branches after release
-rw-r--r--ChangeLog3
-rwxr-xr-xbin/bitbake2
-rw-r--r--lib/bb/__init__.py2
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e5460f477..cd3aa932f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Changes in BitBake 1.6.9:
+
+
Changes in BitBake 1.6.7:
- Make sure __inherit_cache is updated before calling include() (from Michael Krelin)
- Raise ParseError for filenames with multiple underscores instead of infinitely looping (#2062)
diff --git a/bin/bitbake b/bin/bitbake
index 8558ef855..c2ff0ad2f 100755
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -31,7 +31,7 @@ import itertools, optparse, sre_constants
parsespin = itertools.cycle( r'|/-\\' )
-__version__ = "1.6.7"
+__version__ = "1.6.9"
#============================================================================#
# BBParsingStatus
diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py
index b70a06440..79afccd13 100644
--- a/lib/bb/__init__.py
+++ b/lib/bb/__init__.py
@@ -21,7 +21,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-__version__ = "1.6.7"
+__version__ = "1.6.9"
__all__ = [