Merge pull request #1186 from jiajia9linuxer/master

jiajia translating...
This commit is contained in:
Xingyu.Wang 2014-06-15 21:48:44 +08:00
commit a198032eca
2 changed files with 5 additions and 2 deletions

View File

@ -1,3 +1,5 @@
jiajia translating...
Got Linux? Add Proprietary Code
================================================================================
![](http://www.linuxinsider.com/images/rw661226/linux-enterprise-proprietary-code.jpg)

View File

@ -1,3 +1,4 @@
jiajia translating...
Has Microsoft really changed its attitude toward open source?
================================================================================
> **In today's open source roundup: Microsoft may or may not have a new attitude toward open source. Plus: Android versus Windows, and Cinnamon versus Unity in Ubuntu 14.04**