Skip to content
This repository was archived by the owner on May 7, 2025. It is now read-only.

Conversation

@alinnomura
Copy link

No description provided.

Shane Meyer and others added 12 commits April 5, 2014 09:37
Conflicts:
	Classes/PackageResourceConnection.m
	Classes/PackageResourceResponse.m
	Classes/RDPackage.mm
	Classes/RDPackageResource.h
	Classes/RDSpineItem.h
	Classes/RDSpineItem.mm
	SDKLauncher-iOS.xcodeproj/project.pbxproj
	readium-sdk
Conflicts:
	Classes/Constants.h
	Classes/Constants.m
	Classes/LocStrError.h
	Classes/LocStrError.m
	Classes/PackageResourceConnection.h
	Classes/PackageResourceConnection.m
	Classes/PackageResourceResponse.h
	Classes/PackageResourceResponse.m
	Classes/PackageResourceServer.h
	Classes/PackageResourceServer.m
	Classes/RDContainer.h
	Classes/RDContainer.mm
	Classes/RDMediaOverlaysSmilModel.h
	Classes/RDMediaOverlaysSmilModel.mm
	Classes/RDNavigationElement.h
	Classes/RDNavigationElement.mm
	Classes/RDPackage.h
	Classes/RDPackage.mm
	Classes/RDPackageResource.h
	Classes/RDPackageResource.mm
	Classes/RDSmilData.h
	Classes/RDSmilData.mm
	Classes/RDSpineItem.h
	Classes/RDSpineItem.mm
@alinnomura alinnomura closed this May 21, 2014
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants