Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 00:37:48 +0000 (19:37 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 00:37:48 +0000 (19:37 -0500)
1  2 
.gitignore
Makefile.am

diff --cc .gitignore
Simple merge
diff --cc Makefile.am
@@@ -8,10 -8,10 +8,11 @@@ rcdir           = $(configdir)/openbo
  xsessionsdir    = $(datadir)/xsessions
  gnomewmfilesdir = $(datadir)/gnome/wm-properties
  pkgconfigdir    = $(libdir)/pkgconfig
 -pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 +obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
  pixmapdir       = $(datadir)/pixmaps
  xsddir          = $(datadir)/openbox
+ secretbindir    = $(libdir)/openbox
  
  theme = Clearlooks