projects
/
mikachu
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'backport' into work
[mikachu/openbox.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
3ea0363
..
bc20413
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-32,7
+32,7
@@
m4/*.m4
missing
.dirstamp
openbox/openbox
missing
.dirstamp
openbox/openbox
-parser/obparser-
3
.0.pc
+parser/obparser-
4
.0.pc
po/Makefile.in.in
po/Makevars.template
po/POTFILES
po/Makefile.in.in
po/Makevars.template
po/POTFILES
@@
-48,7
+48,8
@@
po/en@boldquot.insert-header
po/en@quot.insert-header
po/remove-potcdate.sed
*.gmo
po/en@quot.insert-header
po/remove-potcdate.sed
*.gmo
-render/obrender-3.0.pc
+render/obrender-4.0.pc
+obt/obt-4.0.pc
tools/gnome-panel-control/gnome-panel-control
tools/gdm-control/gdm-control
tools/obprop/obprop
tools/gnome-panel-control/gnome-panel-control
tools/gdm-control/gdm-control
tools/obprop/obprop