Browse Source

Merge branch 'master' into skia-merge

pull/1077/head
Jeremy Koritzinsky 9 years ago
committed by GitHub
parent
commit
05dedf2e51
  1. 6
      readme.md
  2. 6
      src/Shared/SharedAssemblyInfo.cs

6
readme.md

@ -1,9 +1,9 @@
# Avalonia # Avalonia
| Gitter Chat | Windows Build Status | Linux/Mac Build Status | Code Coverage | | Gitter Chat | Windows Build Status | Linux/Mac Build Status |
|---|---|---|---| |---|---|---|
| [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) | [![codecov](https://codecov.io/gh/AvaloniaUI/Avalonia/branch/master/graph/badge.svg)](https://codecov.io/gh/AvaloniaUI/Avalonia) | | [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) |
A multi-platform .NET UI framework. It can run on Windows, Linux, Mac OS X, iOS and Android. A multi-platform .NET UI framework. It can run on Windows, Linux, Mac OS X, iOS and Android.

6
src/Shared/SharedAssemblyInfo.cs

@ -14,6 +14,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]
[assembly: AssemblyVersion("0.5.1")] [assembly: AssemblyVersion("0.5.2")]
[assembly: AssemblyFileVersion("0.5.1")] [assembly: AssemblyFileVersion("0.5.2")]
[assembly: AssemblyInformationalVersion("0.5.1")] [assembly: AssemblyInformationalVersion("0.5.2")]

Loading…
Cancel
Save