-
Notifications
You must be signed in to change notification settings - Fork 14
/
.gitignore.orig
78 lines (78 loc) · 8.11 KB
/
.gitignore.orig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDI.build/build-state~.dat
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDI.build/NativeMIDI~.dep
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/scm.plist
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Logs/Build/1902400E-ECCF-489D-A2B8-3854F11401FD.xcactivitylog
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Logs/Build/42FEE392-6708-458D-BF42-C691D2D2F13D.xcactivitylog
NativeMIDI/ane_src/ane_build/library.swf
NativeMIDI/ane_src/ane_build/NativeMIDI.swc
NativeMIDI/ane_src/ane_build/NativeMIDI.framework/NativeMIDI
NativeMIDI/ane_src/ane_build/NativeMIDI.framework/Versions/A/NativeMIDI
NativeMIDI/ane_src/ane_build/NativeMIDI.framework/Versions/Current/NativeMIDI
/AIRBonjour/ane_src/native_src/Windows-x86/Release
AIRBonjour/ane_src/native_src/Windows-x86/airBonjour-win.opensdf
AIRBonjour/ane_src/native_src/Windows-x86/airBonjour-win.sdf
NativeMIDI/ane_src/native_src/Windows-x86/NativeMIDI/NativeMIDI.sdf
<<<<<<< .merge_file_lze39T
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDI.build/NativeMIDI-all-target-headers.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDI.build/NativeMIDI-generated-files.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDI.build/NativeMIDI-own-target-headers.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDI.build/NativeMIDI-project-headers.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDI.build/NativeMIDI.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDITests.build/NativeMIDITests-all-target-headers.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDITests.build/NativeMIDITests-generated-files.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDITests.build/NativeMIDITests-own-target-headers.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDITests.build/NativeMIDITests-project-headers.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/Build/Intermediates/NativeMIDI.build/Debug/NativeMIDITests.build/NativeMIDITests.hmap
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/_Builtin_intrinsics.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/AppKit.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/ApplicationServices.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/CFNetwork.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/Cocoa.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/CoreData.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/CoreFoundation.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/CoreGraphics.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/CoreServices.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/CoreText.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/CoreVideo.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/Darwin.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/DiskArbitration.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/Dispatch.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/Foundation.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/ImageIO.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/IOKit.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/IOSurface.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/libkern.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/MachO.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/modules.idx
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/ObjectiveC.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/OpenGL.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/os.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/QuartzCore.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/Security.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/XCTest.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/ModuleCache/3RNSD03FW5TM9/XPC.pcm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/info.plist
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/Debug/macosx10.9-i386/NativeMIDI.xcindex/db.xcindexdb
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/Debug/macosx10.9-i386/NativeMIDI.xcindex/db.xcindexdb-shm
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/Debug/macosx10.9-i386/NativeMIDI.xcindex/db.xcindexdb-wal
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/Debug/macosx10.9-i386/NativeMIDI.xcindex/db.xcindexdb.strings-cmp
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/Debug/macosx10.9-i386/NativeMIDI.xcindex/db.xcindexdb.strings-dir
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/Debug/macosx10.9-i386/NativeMIDI.xcindex/db.xcindexdb.strings-file
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/Debug/macosx10.9-i386/NativeMIDI.xcindex/db.xcindexdb.strings-res
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/Debug/macosx10.9-i386/NativeMIDI.xcindex/db.xcindexdb.strings-sym
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/PrecompiledHeaders/NativeMIDI-Prefix-cymqwkjastdhikekxbwrvvhsdcoi_ast/NativeMIDI-Prefix.pch.pch
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/PrecompiledHeaders/NativeMIDI-Prefix-cymqwkjastdhikekxbwrvvhsdcoi_ast/NativeMIDI-Prefix.pch.pch.hash-criteria
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/PrecompiledHeaders/NativeMIDI-Prefix-cymqwkjastdhikekxbwrvvhsdcoi_ast/NativeMIDI-Prefix.pch.pch.target
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/PrecompiledHeaders/NativeMIDI-Prefix-fwhlcghskdcaoufunkdqrczsnnsv_ast/NativeMIDI-Prefix.pch.pch
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/PrecompiledHeaders/NativeMIDI-Prefix-fwhlcghskdcaoufunkdqrczsnnsv_ast/NativeMIDI-Prefix.pch.pch.hash-criteria
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/Index/PrecompiledHeaders/NativeMIDI-Prefix-fwhlcghskdcaoufunkdqrczsnnsv_ast/NativeMIDI-Prefix.pch.pch.target
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/DerivedData/NativeMIDI/TextIndex/text-index.idx
NativeMIDI/ane_src/native_src/MacOS/NativeMIDI/NativeMIDI.xcodeproj/project.xcworkspace/xcshareddata/NativeMIDI.xccheckout
=======
/AIRVirtualMIDI/ane_src/native_src/Windows-x86/AIRVirtualMIDI/ipch/airvirtualmidi-afaf6426/*.ipch
/Spout2AIR/ane_src/native_src/Windows-x86/SpoutExtension/*.sdf
/AIRVirtualMIDI/ane_src/native_src/Windows-x86/AIRVirtualMIDI/*.sdf
/Spout2AIR/ane_src/native_src/Windows-x86/SpoutExtension/Debug/*.idb
/AIRVirtualMIDI/ane_src/native_src/Windows-x86/AIRVirtualMIDI/Debug/*.idb
/Spout2AIR/ane_src/native_src/Windows-x86/SpoutExtension/Debug/*.tlog
>>>>>>> .merge_file_kTI36K