From ef3be1310be8f2e2b1e593a1e99aac2b2564047c Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Wed, 14 Aug 2013 08:36:37 -0500
Subject: [PATCH] 2b5

---
 CHANGES      | 3 ++-
 build.gradle | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b316ab9a..a5415186 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
 v2.0.0 (TBA)
--Updated to smali/baksmali to v1.4.2
+-Updated to smali/baksmali to v2.0.0b5
 -Updated to Gradle 1.5
 -Fixed (issue #8)   - Correctly uses -c to retain original manifest and META-INF. (Thanks M1cha)
 -Fixed (issue #63)  - Correctly handles apk's that have unknown files outside of the standard aapt allowed resources.
@@ -19,6 +19,7 @@ v2.0.0 (TBA)
 -Fixed (issue #458) - Fixed pkg id not being correctly set in framework files.
 -Fixed (issue #469) - Added (-m / --match-original)
 -Fixed (issue #326) - Fixed PNG increasing brightness on build (Thanks Christiaan)
+-Fixed (issue #448) - Merge smali2 into Apktool
 -Updated known bytes for configurations to 38 (from addition of layout direction)
 -Fixed NPE when handling odex apks even with --no-src specified. (Thanks Rodrigo Chiossi)
 
diff --git a/build.gradle b/build.gradle
index 0c2d9eb5..f625f2a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'license'
 
-ext.apktoolversion = '2.0.0-Beta4'
+ext.apktoolversion = '2.0.0-Beta5'
 ext.fullrev = '';
 ext.gitrev_version = '';