Changeset 80cdb2f for doc/bibliography/cfa.bib

Timestamp:

Apr 5, 2017, 9:05:36 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

2264c11

Parents:

2f0a3599 (diff), 5671b8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix merge conflict

File:

• doc/bibliography/cfa.bib (modified) (1 diff)

doc/bibliography/cfa.bib

@@ -4563 +4563 @@
 }
 
-@book{obj-c-book,
-    keywords    = {objective-c},
-    contributor = {a3moss@uwaterloo.ca},
-    author      = {{Apple Computer Inc.}},
-    title       = {The {Objective-C} Programming Language},
-    year        = 2002
+@manual{obj-c-book,
+    keywords = {objective-c},
+    contributor = {a3moss@uwaterloo.ca},
+    author = {{Apple Computer Inc.}},
+    title = {The {Objective-C} Programming Language},
+    publisher = {Apple Computer Inc.},
+    address = {Cupertino, CA},
+    year = 2003
 }