]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'wip/edges' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Thu, 18 Apr 2013 10:37:45 +0000 (12:37 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Thu, 18 Apr 2013 10:37:45 +0000 (12:37 +0200)
commit22786961997c5b1777abbb2d70bf80f856b66a55
treedd279632ce8a4c8d83d0c58649e895f0c7b1d95e
parentb4a82c5a7c4502a8e345e73c76754e84356cd528
parent985751f287334f5cddbd6272c2d9704ba97afea9
Merge branch 'wip/edges' into wip/mikabox
Makefile.am
openbox/event.c
openbox/frame.c
openbox/openbox.c
openbox/window.c