-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitignore~
31 lines (20 loc) · 1.11 KB
/
.gitignore~
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
*.DS_Store
<<<<<<< HEAD
*.app
lanscapesC_kinect/build/
=======
.app
lanscapesC_kinect/bin/
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/LANscapes.dep
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/LANscapes.dep
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/Objects-normal/i386/currentColor.o
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/Objects-normal/i386/currentColor.o
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/Objects-normal/i386/lanscapes.o
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/Objects-normal/i386/main.o
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/Objects-normal/i386/main.o
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/Objects-normal/i386/processImage.o
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/Objects-normal/i386/processImage.o
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/build-state.dat
lanscapesC_kinect/build/LANscapes.build/Debug/LANscapes.build/build-state.dat
lanscapesC_kinect/build/LANscapes.build/Debug/*
>>>>>>> pixel-glitch