2 Commits

Author	SHA1	Message	Date
Peter Iakovlev	fb270baddd	Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54' ... # Conflicts: # Source/ASVideoPlayerNode.h # Source/Details/ASElementMap.mm # Source/Details/_ASCollectionReusableView.mm # Source/Details/_ASCollectionViewCell.mm # Source/Private/ASMutableElementMap.mm	2018-11-16 14:41:49 +04:00
Adlai Holler	d0ba092a77	Convert the codebase to Objective-C++ (#1206) ... * Convert the codebase to Objective-C++ throughout. One language is better than two. * Put it back * Fix linker * Point explicitly to updated Weaver to unblock build * Revert "Point explicitly to updated Weaver to unblock build" This reverts commit fdc25296e8794d4e6e56c35f5fe6da2be3f71dbc. * Revert "Fix linker" This reverts commit 7be25f91519b8497ef42de79f115bcfbdb965c39. * Add in the frameworks * no message * Address spec lint warnings * Fix tvos build * Put that back * Address Michael's review * Add comment to kick CI	2018-11-02 12:04:14 -07:00