Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fast view snapshotting & improved UX #49 #53

Closed
wants to merge 33 commits into from

Conversation

DasHutch
Copy link

@DasHutch DasHutch commented Jun 26, 2016

goddamn auto refreshing github page when changing PR branches... it'll be the death of me.

waterskier2007 and others added 30 commits March 18, 2016 08:55
…global variables, and an option to tint the images or not
…o waterskier2007-master

# Conflicts:
#	Classes/Assets.xcassets/ic_radio_button_checked.imageset/Contents.json
#	Classes/Assets.xcassets/ic_radio_button_checked.imageset/ic_radio_button_checked_white_24px.png
#	Classes/Assets.xcassets/ic_radio_button_checked.imageset/[email protected]
#	Classes/Assets.xcassets/ic_radio_button_checked.imageset/[email protected]
#	Classes/Assets.xcassets/shutter_button.imageset/Contents.json
#	Classes/Assets.xcassets/shutter_button.imageset/ic_radio_button_checked_white_24px.png
#	Classes/Assets.xcassets/shutter_button.imageset/[email protected]
#	Classes/Assets.xcassets/shutter_button.imageset/[email protected]
#	Example/Fusuma.xcodeproj/project.pbxproj
#	Example/FusumaExample/Base.lproj/Main.storyboard
#	Example/FusumaExample/ViewController.swift
#	Example/Podfile
#	Example/Podfile.lock
#	Example/Pods/Local Podspecs/Fusuma.podspec.json
#	Example/Pods/Manifest.lock
#	Example/Pods/Pods.xcodeproj/project.pbxproj
#	Example/Pods/Target Support Files/Fusuma/Info.plist
#	Example/Pods/Target Support Files/Pods-Fusuma_Tests/Pods-Fusuma_Tests-acknowledgements.markdown
#	Example/Pods/Target Support Files/Pods-Fusuma_Tests/Pods-Fusuma_Tests-acknowledgements.plist
#	Example/Pods/Target Support Files/Pods-Fusuma_Tests/Pods-Fusuma_Tests-frameworks.sh
#	Example/Pods/Target Support Files/Pods-Fusuma_Tests/Pods-Fusuma_Tests.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-Fusuma_Tests/Pods-Fusuma_Tests.release.xcconfig
#	Fusuma.podspec
#	Fusuma.xcodeproj/xcshareddata/xcschemes/Fusuma.xcscheme
#	README.md
#	Sources/Assets.xcassets/ic_radio_button_checked.imageset/Contents.json
#	Sources/Assets.xcassets/ic_radio_button_checked.imageset/ic_radio_button_checked_white_24px.png
#	Sources/Assets.xcassets/ic_radio_button_checked.imageset/[email protected]
#	Sources/Assets.xcassets/ic_radio_button_checked.imageset/[email protected]
#	Sources/FSCameraView.swift
#	Sources/FSCameraView.xib
#	Sources/FSConstants.swift
#	Sources/FusumaViewController.swift
#	Sources/FusumaViewController.xib
Add video support from waterskier2007 and add theming options
@DasHutch DasHutch closed this Jun 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants