diff options
author | kaernyk <kaernyk@gmail.com> | 2014-09-09 21:05:13 -0400 |
---|---|---|
committer | kaernyk <kaernyk@gmail.com> | 2014-09-09 21:05:13 -0400 |
commit | a4e381d756dd8bc8e992ef0da41b4e0b50e0e59e (patch) | |
tree | 9d5695f75c332c6f39bc0761a478ef94181feb5c /objective-c.html.markdown | |
parent | 0833c79b34c36cf4121055f0bf929a5526d0d5ea (diff) | |
parent | 38c4138a7b62c0507c7de6917ddac0b800cc7150 (diff) |
Merge remote-tracking branch 'upstream/master'
pull latest
Diffstat (limited to 'objective-c.html.markdown')
-rw-r--r-- | objective-c.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/objective-c.html.markdown b/objective-c.html.markdown index 772e72ca..caad49a5 100644 --- a/objective-c.html.markdown +++ b/objective-c.html.markdown @@ -12,7 +12,7 @@ filename: LearnObjectiveC.m Objective-C is the main programming language used by Apple for the OS X and iOS operating systems and their respective frameworks, Cocoa and Cocoa Touch. It is a general-purpose, object-oriented programming language that adds Smalltalk-style messaging to the C programming language. -```cpp +```objective_c // Single-line comments start with // /* |