"merged" 1.2 to master so development on the next version can start. Modified the README.md to reflect changes.

This commit is contained in:
RKrom 2015-01-19 12:09:13 +01:00
commit edb758e3d8

View file

@ -37,12 +37,6 @@ We now have a continuous integration system, you can find the latest unstable 1.
Current build status 1.2 branch: ![Unknown](https://ci.appveyor.com/api/projects/status/yh4jnjbo03qrl60d/branch/1.2?svg=true)
**master**
The master branch has that which some day will be available in Greenshot 2.x.
As we are re factoring and changing a lot of code for 2.x, this branch should be considered highly unstable!
We accept pull-requests for 2.x, but it might be better to wait with bigger changes until things settle down a bit.
Developing for Greenshot
------------------------
We develop Greenshot with Visual Studio Express 2013 and tested our solution on Visual Studio Professional 2012.