diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-08-03 05:45:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2015-08-03 05:45:18 -0700 |
| commit | 01ea3c16d6b37f52fe3e5f5367d53e3dbae9e1fc (patch) | |
| tree | 2175322957167ea3f3bebd754149c313aa8c1a76 /adt-branding | |
| parent | 6cee7dda3c5a91f54696eda6a0124bcc0142f219 (diff) | |
| parent | aca158a1cc23382b02b756d3be6af92f995c728a (diff) | |
| download | idea-01ea3c16d6b37f52fe3e5f5367d53e3dbae9e1fc.tar.gz | |
resolve merge conflicts of aca158a to studio-1.4-dev.
Change-Id: I4f966eadb8378ba44f7439059e91070877842c76
Diffstat (limited to 'adt-branding')
| -rwxr-xr-x | adt-branding/src/idea/AndroidStudioApplicationInfo.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml index 22d0ebb8c3f..41dffe720ec 100755 --- a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml +++ b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml @@ -14,7 +14,7 @@ ~ limitations under the License. --> <component> - <version major="1" minor="4" micro="0" patch="0" full="{0}.{1}" eap="true" /> + <version major="1" minor="4" micro="0" patch="0" full="{0}.{1} Preview" eap="true" /> <company name="Google" url="http://developer.android.com"/> <build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="141.1532.4"/> <install-over minbuild="0.1" maxbuild="999.999999" version="0"/> |