mirror of
https://github.com/EbookFoundation/free-programming-books.git
synced 2024-12-30 07:15:28 +00:00
Resolve conflict
This commit is contained in:
commit
a28452cb8d
@ -73,7 +73,6 @@
|
||||
### iOS
|
||||
* [AppCoda Complete iOS Tutorial](http://www.appcoda.com/ios-programming-course/)
|
||||
* [Developing iOS 7 Apps for iPhone and iPad](https://itunes.apple.com/us/course/developing-ios-7-apps-for/id733644550)
|
||||
* [Stanford CS 193P iPhone Application Development](http://web.stanford.edu/class/cs193p/cgi-bin/drupal/)
|
||||
|
||||
|
||||
### Java
|
||||
@ -107,6 +106,9 @@
|
||||
* [Computer Graphics](http://nptel.ac.in/courses/106106090/)
|
||||
* [MIT´s Computer Language Engineering](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-035-computer-language-engineering-sma-5502-fall-2005/lecture-notes/)
|
||||
* [MIT´s Mathematics for Computer Science](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-042j-mathematics-for-computer-science-fall-2010/video-lectures/)
|
||||
* [MIT´s Introduction to Algorithms](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-006-introduction-to-algorithms-fall-2011/)
|
||||
* [Stanford Cryptography I](https://www.coursera.org/course/crypto)
|
||||
* [Stanford Cryptography II](https://www.coursera.org/course/crypto2)
|
||||
|
||||
|
||||
### OCaml
|
||||
|
Loading…
Reference in New Issue
Block a user