From b7f51ea718ad6356c8b8650c623e6fedb09af255 Mon Sep 17 00:00:00 2001 From: jiajia <1534574360@qq.com> Date: Sun, 15 Jun 2014 21:45:36 +0800 Subject: [PATCH 1/2] Update 20140607 Got Linux--Add Proprietary Code.md --- sources/talk/20140607 Got Linux--Add Proprietary Code.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/talk/20140607 Got Linux--Add Proprietary Code.md b/sources/talk/20140607 Got Linux--Add Proprietary Code.md index df1bac5757..996f738c66 100644 --- a/sources/talk/20140607 Got Linux--Add Proprietary Code.md +++ b/sources/talk/20140607 Got Linux--Add Proprietary Code.md @@ -1,3 +1,5 @@ +jiajia translating... + Got Linux? Add Proprietary Code ================================================================================ ![](http://www.linuxinsider.com/images/rw661226/linux-enterprise-proprietary-code.jpg) @@ -109,4 +111,4 @@ via: http://www.linuxinsider.com/story/80555.html [1]:http://www.icewarp.com/ [2]:https://lucerahq.com [3]:http://www.fsmlabs.com/ -[4]:http://www.bell-labs.com/ \ No newline at end of file +[4]:http://www.bell-labs.com/ From 21f64525f8e4f552cd32526cd1f43ec36fe48200 Mon Sep 17 00:00:00 2001 From: jiajia <1534574360@qq.com> Date: Sun, 15 Jun 2014 21:47:04 +0800 Subject: [PATCH 2/2] Update 20140609 Has Microsoft really changed its attitude toward open source.md --- ...Microsoft really changed its attitude toward open source.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/talk/20140609 Has Microsoft really changed its attitude toward open source.md b/sources/talk/20140609 Has Microsoft really changed its attitude toward open source.md index 6d923b1e20..bfda83b9b5 100644 --- a/sources/talk/20140609 Has Microsoft really changed its attitude toward open source.md +++ b/sources/talk/20140609 Has Microsoft really changed its attitude toward open source.md @@ -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** @@ -78,4 +79,4 @@ via: http://www.itworld.com/open-source/421894/has-microsoft-really-changed-its- [4]:http://www.zdnet.com/the-five-most-popular-end-user-linux-distributions-7000030058/http://www.zdnet.com/the-five-most-popular-end-user-linux-distributions-7000030058/ [5]:http://www.amazon.com/Best-Sellers-Electronics-Desktop-Computers/zgbs/electronics/565098/?_encoding=UTF8&camp=1789&creative=390957&linkCode=ur2&tag=fnh-20&linkId=REWXUPB7SQXPDSOL [6]:http://www.amazon.com/Best-Sellers-Computers-Accessories-Laptop/zgbs/pc/565108/?_encoding=UTF8&camp=1789&creative=390957&linkCode=ur2&tag=fnh-20&linkId=POG3J2CFBHDWBAVL -[7]:http://www.techrepublic.com/article/is-cinnamon-a-worthy-replacement-for-ubuntu-unity/ \ No newline at end of file +[7]:http://www.techrepublic.com/article/is-cinnamon-a-worthy-replacement-for-ubuntu-unity/