aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
blob: 8604c65a6c84ca6d0ed4d91ba2cce03ecf0c3b57 (plain)
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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
<<<<<<< HEAD
.gitignore
Makefile.in
Makefile
autom4te.cache
.deps
.libs
*.pc
*.la
*.lo
*.o
*~
confdefs.h
=======
*.la
*.lo
*.o
*.swo
*.swp
Makefile.in
Makefile
.deps
.libs
COPYING
INSTALL
aclocal.m4
autom4te.cache
>>>>>>> Adds an initial .gitignore file
config.guess
config.log
config.status
config.sub
configure
<<<<<<< HEAD
matchbox/managers/simple/matchbox-window-manager-2-simple
matchbox/mb-wm-config.h
=======
>>>>>>> Adds an initial .gitignore file
depcomp
install-sh
libtool
ltmain.sh
missing
<<<<<<< HEAD
*.orig
*.rej
aclocal.m4
COPYING
INSTALL
=======
gtk-doc.make
tags
matchbox-2.0.pc
matchbox/mb-wm-config.h
doc/reference/matchbox/html-build.stamp
doc/reference/matchbox/html.stamp
doc/reference/matchbox/html/
doc/reference/matchbox/matchbox-decl-list.txt
doc/reference/matchbox/matchbox-decl.txt
doc/reference/matchbox/matchbox-docs.sgml
doc/reference/matchbox/matchbox-overrides.txt
doc/reference/matchbox/matchbox-sections.txt
doc/reference/matchbox/matchbox-undeclared.txt
doc/reference/matchbox/matchbox-undocumented.txt
doc/reference/matchbox/matchbox-unused.txt
doc/reference/matchbox/matchbox.args
doc/reference/matchbox/matchbox.hierarchy
doc/reference/matchbox/matchbox.interfaces
doc/reference/matchbox/matchbox.prerequisites
doc/reference/matchbox/matchbox.signals
doc/reference/matchbox/matchbox.types
doc/reference/matchbox/matchbox2-decl-list.txt
doc/reference/matchbox/matchbox2-decl-list.txt.bak
doc/reference/matchbox/matchbox2-decl.txt
doc/reference/matchbox/matchbox2-decl.txt.bak
doc/reference/matchbox/matchbox2-overrides.txt
doc/reference/matchbox/matchbox2-undeclared.txt
doc/reference/matchbox/matchbox2-undocumented.txt
doc/reference/matchbox/matchbox2-unused.txt
doc/reference/matchbox/matchbox2.args
doc/reference/matchbox/matchbox2.hierarchy
doc/reference/matchbox/matchbox2.interfaces
doc/reference/matchbox/matchbox2.prerequisites
doc/reference/matchbox/matchbox2.signals
doc/reference/matchbox/scan-build.stamp
doc/reference/matchbox/sgml-build.stamp
doc/reference/matchbox/sgml.stamp
doc/reference/matchbox/version.xml
doc/reference/matchbox/xml/
managers/maemo/matchbox-window-manager-2-maemo
managers/simple/matchbox-window-manager-2-simple
>>>>>>> Adds an initial .gitignore file