Commit Graph

201 Commits

Author SHA1 Message Date
Xin Peng f3e4b17e9a update for Haodan 2020-03-04 12:40:12 +08:00
Xin Peng a1749020d0 update Ch1-5 software industry 2020-03-02 00:22:55 +08:00
Xin Peng 6e890f16e9 update ch1-2 and reference 2020-03-01 08:30:52 +08:00
Xin Peng e95d8eee13 Merge branch 'master' of http://git.trustie.net/Dan_Hao/software-strategy-book
# Conflicts:
#	Ch1-2-ProgrammingLanguage.tex
2020-02-29 22:19:01 +08:00
Xin Peng 8ee8842cc2 update ch1-2 and ch2-2 for Haodan 2020-02-29 22:17:36 +08:00
Xiaoxing Ma 5e796025d2 对第一篇程序设计语言章的一些小修改,留了一个给郝监军。 2020-02-29 21:46:00 +08:00
Xin Peng 93ba0c3f84 update for Haodan 2020-02-27 09:53:21 +08:00
Xin Peng f22a897e3f Merge branch 'master' of http://git.trustie.net/Dan_Hao/software-strategy-book 2020-02-26 20:11:27 +08:00
Xin Peng 257a5654c8 update for Haodan 2020-02-26 20:11:18 +08:00
Xiaoxing Ma 662e3f0fc3 根据李宣东老师提供的参考文献,插入到文中合适位置,并补充到references.bib中 2020-02-25 20:14:13 +08:00
Xin Peng 868aeebf7a update files for Haodan 2020-02-25 11:52:07 +08:00
Xiaoxing Ma fc06469bfd 第二篇 软件开发方法章的几个微小文字修改。主要意见是应该加几个主要参考文献。
另外,去除了ch3-1的不必要的latex文档头尾,以便放在整书里编译。
2020-02-22 10:26:57 +08:00
Xiaoxing Ma 41b2ed5ef7 Merge branch 'master' of http://git.trustie.net/Dan_Hao/software-strategy-book 2020-02-21 14:26:17 +08:00
Xiaoxing Ma 67a7bf9061 完成21日讨论的一些关于摘要、历史的问题,同时修复了一些文件的mode -- Ch1-2, Ch2-2 文件内容没改。 2020-02-21 14:25:48 +08:00
Xin Peng 7e10d5975d Merge branch 'master' of http://git.trustie.net/Dan_Hao/software-strategy-book 2020-02-21 11:12:23 +08:00
Xin Peng dcf61ab0c0 update Ch3-1 for Minghui Zhou 2020-02-21 11:11:55 +08:00
Xin Peng 2f944c8faa ch2-1 revised 2020-02-21 11:07:25 +08:00
Xiaoxing Ma 1b2e214184 Merge branch 'master' of http://git.trustie.net/Dan_Hao/software-strategy-book
# Conflicts:
#	references.bib
2020-02-20 23:49:38 +08:00
Xiaoxing Ma 1f5e3b52cf 继续修改软件工程这一章,留下两个批注待原作者确认。 2020-02-20 23:45:31 +08:00
Xin Peng 53a65a6b93 one more reference 2020-02-20 20:43:03 +08:00
Xin Peng 3061b191f0 add 2 references for Chapter 1-5 2020-02-20 20:36:46 +08:00
Xin Peng c24b752431 Merge branch 'master' of http://git.trustie.net/Dan_Hao/software-strategy-book
# Conflicts:
#	.DS_Store
2020-02-20 17:25:37 +08:00
Xin Peng 45eee454fb no message 2020-02-20 17:24:14 +08:00
Xiaoxing Ma 60b9f8af0e minor changes and comments on ch1-4 software engineering 2020-02-20 14:09:16 +08:00
Xiaoxing Ma 48d03961da 改了一遍第一篇第一章,留了一些标记,还需审读。 2020-02-18 21:55:18 +08:00
Xiaoxing Ma 3b3345c945 dan's notes, to be reviewed and revised --xiaoxing 2020-02-14 15:57:41 +08:00
Xiaoxing Ma e361a91304 Merge commit '027583195c8c51355e66cb52be8ea4e4ce3c4e1c' into xiaoxing 2020-02-14 15:53:36 +08:00
Xiaoxing Ma 0e91c156fc 摘要部分修改 2020-02-14 15:49:39 +08:00
Xin Peng 027583195c Ji's revision of Ch2-1 2020-02-13 22:10:11 +08:00
wang-hpc 15ccd8c623 Merge branch 'wangji' of http://git.trustie.net/Dan_Hao/software-strategy-book into intro 2020-02-05 18:41:54 +08:00
wang-hpc bf24c7e128 chapters 0-1,1-1,2-1 updated 2020-02-05 18:40:05 +08:00
Xiaoxing Ma 8af71c1625 Ji's revisions 2020-02-05 18:12:37 +08:00
Xin Peng 625fc4ba7a update Ch2-7 for Haodan 2020-02-03 18:58:35 +08:00
DanHaoPKU 145f2a987b update Ch1-1 2019-12-25 11:34:29 +08:00
DanHaoPKU 41cb6462a6 add one reference and modify Ch2-1 2019-12-24 10:41:23 +08:00
Xin Peng f6d9341c9d add references to Ch2-1 2019-12-22 21:07:29 +08:00
Xin Peng 397ac10192 Merge branch 'master' of http://git.trustie.net/Dan_Hao/software-strategy-book 2019-12-22 11:22:26 +08:00
Xin Peng 7b74c958ff no message 2019-12-22 11:22:18 +08:00
DanHaoPKU 2a4f2f946b update Ch2-1 2019-12-19 15:50:00 +08:00
DanHaoPKU 753566a402 update abstract 2019-12-18 08:34:28 +08:00
DanHaoPKU 763ac0ca36 update Ch2-4 and Ch2-8 2019-12-14 11:02:07 +08:00
DanHaoPKU bedf541243 update ch2-6 2019-12-13 09:02:25 +08:00
HaoDan 9d66b1bd82 Merge branch 'dingbo' into 'master'
Minor changes to CH3&CH10

修改了 Ch1-3-SystemSoftware.tex、Ch2-5-OperatingSystem.tex、fig2-5/cnt.png三个文件


See merge request !32
2019-12-11 11:22:45 +08:00
dingbo 7990c03f9e Minor changes to CH3&CH10 2019-12-10 17:16:31 +08:00
DanHaoPKU c8fc8834e0 update Ch1-5 2019-12-09 21:46:35 +08:00
DanHaoPKU ed226aa4b4 update Ch1-5 2019-12-09 12:44:19 +08:00
HaoDan 2847bd54f3 Merge branch 'xjmao' into 'master'
edit Ch2-10

edit Ch2-10

See merge request !30
2019-12-09 12:39:06 +08:00
HaoDan 2ee3180b3e Merge branch 'dingbo' into 'master'
第三章和第十章修改

第三章和第十章修改

See merge request !29
2019-12-09 12:38:47 +08:00
lan 59fe62f1b0 edit Ch2-10 2019-12-09 11:43:12 +08:00
dingbo dec45f43ea CH3&CH10 modification 2019-12-08 23:15:52 +08:00