mikachu/openbox.git
16 years agomerge r6864 from trunk openbox-3_3_993-RELEASE
Dana Jansens [Fri, 25 May 2007 19:20:34 +0000 (19:20 +0000)]
merge r6864 from trunk

16 years agomerge r6816-6862 from trunk
Dana Jansens [Fri, 25 May 2007 19:18:55 +0000 (19:18 +0000)]
merge r6816-6862 from trunk

16 years agofix positioning of tlt, top and trt resize elements. thanks mulberry
Dana Jansens [Thu, 24 May 2007 18:31:56 +0000 (18:31 +0000)]
fix positioning of tlt, top and trt resize elements. thanks mulberry

16 years agomerge r6810 from trunk openbox-3_3_992-RELEASE
Dana Jansens [Thu, 24 May 2007 12:55:38 +0000 (12:55 +0000)]
merge r6810 from trunk

16 years agoupdate .po files so they have the desktop %i string
Mikael Magnusson [Thu, 24 May 2007 12:49:59 +0000 (12:49 +0000)]
update .po files so they have the desktop %i string

16 years agomerge r6768-6807 from trunk
Dana Jansens [Thu, 24 May 2007 12:48:28 +0000 (12:48 +0000)]
merge r6768-6807 from trunk

16 years agomerge translations to 3.4 branch
Mikael Magnusson [Wed, 23 May 2007 20:48:12 +0000 (20:48 +0000)]
merge translations to 3.4 branch

16 years agomerge r6766-6767 from trunk
Dana Jansens [Tue, 22 May 2007 20:51:37 +0000 (20:51 +0000)]
merge r6766-6767 from trunk

16 years agomerge r6764 from trunk
Dana Jansens [Tue, 22 May 2007 18:51:49 +0000 (18:51 +0000)]
merge r6764 from trunk

16 years agomerge r6750 from trunk
Dana Jansens [Tue, 22 May 2007 18:50:56 +0000 (18:50 +0000)]
merge r6750 from trunk

16 years agomerge r6759-6761 from trunk
Dana Jansens [Tue, 22 May 2007 18:22:32 +0000 (18:22 +0000)]
merge r6759-6761 from trunk

16 years agomerge r6757 from trunk
Dana Jansens [Tue, 22 May 2007 18:07:27 +0000 (18:07 +0000)]
merge r6757 from trunk

16 years agomerge r6575 from trunk
Dana Jansens [Tue, 22 May 2007 17:59:34 +0000 (17:59 +0000)]
merge r6575 from trunk

16 years agomerge r6573 from trunk
Dana Jansens [Tue, 22 May 2007 17:56:17 +0000 (17:56 +0000)]
merge r6573 from trunk

16 years agomerge r6571 from trunk
Dana Jansens [Tue, 22 May 2007 17:47:21 +0000 (17:47 +0000)]
merge r6571 from trunk

16 years agomerge r6748 from trunk
Dana Jansens [Tue, 22 May 2007 15:43:49 +0000 (15:43 +0000)]
merge r6748 from trunk

16 years agomerge r6746 from trunk
Dana Jansens [Tue, 22 May 2007 15:35:10 +0000 (15:35 +0000)]
merge r6746 from trunk

16 years agomerge r6742 from trunk openbox-3_3_991-RELEASE
Dana Jansens [Tue, 22 May 2007 06:16:02 +0000 (06:16 +0000)]
merge r6742 from trunk

16 years agomerge r6739 from trunk
Dana Jansens [Tue, 22 May 2007 05:15:42 +0000 (05:15 +0000)]
merge r6739 from trunk

16 years agomerge r6735 from trunk
Dana Jansens [Tue, 22 May 2007 05:01:01 +0000 (05:01 +0000)]
merge r6735 from trunk

16 years agomerge r6733 from trunk
Dana Jansens [Tue, 22 May 2007 04:56:08 +0000 (04:56 +0000)]
merge r6733 from trunk

16 years agomerge r6729-6731 from trunk
Dana Jansens [Tue, 22 May 2007 04:36:09 +0000 (04:36 +0000)]
merge r6729-6731 from trunk

16 years agomerge r6727 from trunk
Dana Jansens [Tue, 22 May 2007 04:07:46 +0000 (04:07 +0000)]
merge r6727 from trunk

16 years agomerge r6724 from trunk
Dana Jansens [Tue, 22 May 2007 03:18:19 +0000 (03:18 +0000)]
merge r6724 from trunk

16 years agoadd the openbox.pot, like trunk has
Dana Jansens [Tue, 22 May 2007 03:10:09 +0000 (03:10 +0000)]
add the openbox.pot, like trunk has

16 years agomerge r6704-6722 from trunk
Dana Jansens [Tue, 22 May 2007 03:07:08 +0000 (03:07 +0000)]
merge r6704-6722 from trunk

16 years agomerge r6699-6702 from trunk
Dana Jansens [Mon, 21 May 2007 15:10:46 +0000 (15:10 +0000)]
merge r6699-6702 from trunk

16 years agocommit the po's that are going out with 3.3.990
Dana Jansens [Mon, 21 May 2007 04:11:06 +0000 (04:11 +0000)]
commit the po's that are going out with 3.3.990

16 years agomerge r6692-6693 from trunk
Dana Jansens [Mon, 21 May 2007 04:05:38 +0000 (04:05 +0000)]
merge r6692-6693 from trunk

16 years agomerge r6677-6689 from trunk
Dana Jansens [Mon, 21 May 2007 02:39:06 +0000 (02:39 +0000)]
merge r6677-6689 from trunk

16 years agoremove the old font stuff from themes, leaving just the shadow stuff, as a nice examp...
Dana Jansens [Mon, 21 May 2007 00:58:54 +0000 (00:58 +0000)]
remove the old font stuff from themes, leaving just the shadow stuff, as a nice example for themers

16 years agooops i tht they were already added
Dana Jansens [Sun, 20 May 2007 15:38:43 +0000 (15:38 +0000)]
oops i tht they were already added

16 years agomerge r6674 from trunk
Dana Jansens [Sun, 20 May 2007 15:28:54 +0000 (15:28 +0000)]
merge r6674 from trunk

16 years agomerge r6667-6672 from trunk
Dana Jansens [Sun, 20 May 2007 15:28:18 +0000 (15:28 +0000)]
merge r6667-6672 from trunk

16 years agomerge r6648-6665 from trunk
Dana Jansens [Sun, 20 May 2007 07:11:35 +0000 (07:11 +0000)]
merge r6648-6665 from trunk

16 years agomerge r6646 from trunk
Dana Jansens [Sat, 19 May 2007 23:16:04 +0000 (23:16 +0000)]
merge r6646 from trunk

16 years agomerge r6636-6644 from trunk
Dana Jansens [Sat, 19 May 2007 23:02:32 +0000 (23:02 +0000)]
merge r6636-6644 from trunk

16 years agomerge r6599-6634 from trunk
Dana Jansens [Sat, 19 May 2007 20:55:28 +0000 (20:55 +0000)]
merge r6599-6634 from trunk

16 years agomerge r6595-6597 from trunk
Dana Jansens [Thu, 17 May 2007 02:30:13 +0000 (02:30 +0000)]
merge r6595-6597 from trunk

16 years agomerge r6585-6593 from trunk
Dana Jansens [Thu, 17 May 2007 01:45:39 +0000 (01:45 +0000)]
merge r6585-6593 from trunk

16 years agomerge the POTFILES.in from trunk
Dana Jansens [Wed, 16 May 2007 17:17:07 +0000 (17:17 +0000)]
merge the POTFILES.in from trunk

16 years agomore mis-merging
Dana Jansens [Wed, 16 May 2007 17:10:39 +0000 (17:10 +0000)]
more mis-merging

16 years agomerge r6577-6578 from trunk
Dana Jansens [Wed, 16 May 2007 17:06:41 +0000 (17:06 +0000)]
merge r6577-6578 from trunk

16 years agomis-merge.. thank you mikachan
Dana Jansens [Wed, 16 May 2007 17:06:18 +0000 (17:06 +0000)]
mis-merge.. thank you mikachan

16 years agomerge r6573-6575 from trunk
Dana Jansens [Wed, 16 May 2007 14:24:40 +0000 (14:24 +0000)]
merge r6573-6575 from trunk

16 years agomerge r6571 from trunk
Dana Jansens [Wed, 16 May 2007 00:29:04 +0000 (00:29 +0000)]
merge r6571 from trunk

16 years agomerge r6569 from trunk
Dana Jansens [Wed, 16 May 2007 00:08:11 +0000 (00:08 +0000)]
merge r6569 from trunk

16 years agoadd the man pages..
Dana Jansens [Tue, 15 May 2007 23:48:01 +0000 (23:48 +0000)]
add the man pages..

16 years agocommit man pages so iit compiles?
Dana Jansens [Tue, 15 May 2007 23:02:47 +0000 (23:02 +0000)]
commit man pages so iit compiles?

16 years agoopenbox.1 wasnt added, oops
Dana Jansens [Tue, 15 May 2007 23:00:05 +0000 (23:00 +0000)]
openbox.1 wasnt added, oops

16 years agomerge r6563 from trunk
Dana Jansens [Tue, 15 May 2007 17:39:22 +0000 (17:39 +0000)]
merge r6563 from trunk

16 years agomerge r6561 from trunk
Dana Jansens [Tue, 15 May 2007 16:10:31 +0000 (16:10 +0000)]
merge r6561 from trunk

16 years agomerge 6559 from trunk
Dana Jansens [Tue, 15 May 2007 15:37:53 +0000 (15:37 +0000)]
merge 6559 from trunk

16 years agomerge r6533-6557 from trunk
Dana Jansens [Tue, 15 May 2007 15:20:56 +0000 (15:20 +0000)]
merge r6533-6557 from trunk

16 years agomerge r6529-6531 from trunk
Dana Jansens [Mon, 14 May 2007 13:47:25 +0000 (13:47 +0000)]
merge r6529-6531 from trunk

16 years agocopy fallback test from trunk
Dana Jansens [Mon, 14 May 2007 02:32:16 +0000 (02:32 +0000)]
copy fallback test from trunk

16 years agomerge r6524-6525 from trunk
Dana Jansens [Mon, 14 May 2007 02:28:33 +0000 (02:28 +0000)]
merge r6524-6525 from trunk

16 years agomerge r6520-6522 from trunk
Dana Jansens [Mon, 14 May 2007 02:07:42 +0000 (02:07 +0000)]
merge r6520-6522 from trunk

16 years agomerge r6518 from trunk
Dana Jansens [Mon, 14 May 2007 01:07:00 +0000 (01:07 +0000)]
merge r6518 from trunk

16 years agomerge r6516 from trunk
Dana Jansens [Mon, 14 May 2007 00:41:48 +0000 (00:41 +0000)]
merge r6516 from trunk

16 years agogenerated changes for manage
Dana Jansens [Mon, 14 May 2007 00:34:18 +0000 (00:34 +0000)]
generated changes for manage

16 years agomerge r6512-6513 from trunk
Dana Jansens [Mon, 14 May 2007 00:33:54 +0000 (00:33 +0000)]
merge r6512-6513 from trunk

16 years agomerge r6508-6510 from trunk
Dana Jansens [Mon, 14 May 2007 00:29:10 +0000 (00:29 +0000)]
merge r6508-6510 from trunk

16 years agomerge r6504-6506 from trunk
Dana Jansens [Sun, 13 May 2007 23:31:14 +0000 (23:31 +0000)]
merge r6504-6506 from trunk

16 years agomerge r6494-6502 from trunk
Dana Jansens [Sun, 13 May 2007 23:16:17 +0000 (23:16 +0000)]
merge r6494-6502 from trunk

16 years agomerge r6491-6492 from trunk
Dana Jansens [Sun, 13 May 2007 22:36:32 +0000 (22:36 +0000)]
merge r6491-6492 from trunk

16 years agomerge r6484-6489 from trunk
Dana Jansens [Sun, 13 May 2007 22:33:52 +0000 (22:33 +0000)]
merge r6484-6489 from trunk

16 years agomerge r6480-6482 from trunk
Dana Jansens [Sun, 13 May 2007 22:07:07 +0000 (22:07 +0000)]
merge r6480-6482 from trunk

16 years agomerge r6470-6478 from trunk
Dana Jansens [Sun, 13 May 2007 21:58:04 +0000 (21:58 +0000)]
merge r6470-6478 from trunk

16 years agomerge r6463-6468 from trunk
Dana Jansens [Sun, 13 May 2007 20:43:04 +0000 (20:43 +0000)]
merge r6463-6468 from trunk

16 years agomerge r6460-6461 from trunk
Dana Jansens [Sun, 13 May 2007 20:08:32 +0000 (20:08 +0000)]
merge r6460-6461 from trunk

16 years agomerge r6452-6458 from trunk
Dana Jansens [Sun, 13 May 2007 19:50:08 +0000 (19:50 +0000)]
merge r6452-6458 from trunk

16 years agomerge r6450 from trunk
Dana Jansens [Sun, 13 May 2007 18:01:29 +0000 (18:01 +0000)]
merge r6450 from trunk

16 years agomerge r6434-6447 from trunk
Dana Jansens [Sun, 13 May 2007 17:54:46 +0000 (17:54 +0000)]
merge r6434-6447 from trunk

16 years agoadd author information
Dana Jansens [Sun, 13 May 2007 17:53:54 +0000 (17:53 +0000)]
add author information

16 years agomerge r6430-6432 from trunk
Dana Jansens [Sun, 13 May 2007 07:13:35 +0000 (07:13 +0000)]
merge r6430-6432 from trunk

16 years agoadd "Bottom" context too. just make Handle and Bottom synonomous.
Dana Jansens [Sun, 13 May 2007 03:24:29 +0000 (03:24 +0000)]
add "Bottom" context too. just make Handle and Bottom synonomous.

16 years agomerge r6421-6427 from trunk
Dana Jansens [Sun, 13 May 2007 03:21:18 +0000 (03:21 +0000)]
merge r6421-6427 from trunk

16 years agomerge r6419 from trunk
Dana Jansens [Sun, 13 May 2007 00:22:38 +0000 (00:22 +0000)]
merge r6419 from trunk

16 years agomerge r6415-6416 from trunk
Dana Jansens [Sun, 13 May 2007 00:21:01 +0000 (00:21 +0000)]
merge r6415-6416 from trunk

16 years agomerge r6415-6416 from trunk
Dana Jansens [Sun, 13 May 2007 00:20:46 +0000 (00:20 +0000)]
merge r6415-6416 from trunk

16 years agomerge r6413 from trunk
Dana Jansens [Sun, 13 May 2007 00:16:59 +0000 (00:16 +0000)]
merge r6413 from trunk

16 years agomerge r6410-6411 from trunk
Dana Jansens [Sun, 13 May 2007 00:02:03 +0000 (00:02 +0000)]
merge r6410-6411 from trunk

16 years agomerge r6407-6408 from trunk
Dana Jansens [Sat, 12 May 2007 23:02:00 +0000 (23:02 +0000)]
merge r6407-6408 from trunk

16 years agomerge r6404-6405 from trunk
Dana Jansens [Sat, 12 May 2007 22:54:44 +0000 (22:54 +0000)]
merge r6404-6405 from trunk

16 years agomerge r6402 from trunk
Dana Jansens [Sat, 12 May 2007 22:30:55 +0000 (22:30 +0000)]
merge r6402 from trunk

16 years agomerge r6394-6399 from trunk
Dana Jansens [Sat, 12 May 2007 22:22:00 +0000 (22:22 +0000)]
merge r6394-6399 from trunk

16 years agocopy debian from trunk
Dana Jansens [Sat, 12 May 2007 22:21:05 +0000 (22:21 +0000)]
copy debian from trunk

16 years agoupdate po's from trunk again
Dana Jansens [Sat, 12 May 2007 19:53:43 +0000 (19:53 +0000)]
update po's from trunk again

16 years agoupdate po's from trunk
Dana Jansens [Sat, 12 May 2007 19:53:01 +0000 (19:53 +0000)]
update po's from trunk

16 years agomerge r6386-6388 from trunk
Dana Jansens [Sat, 12 May 2007 19:51:13 +0000 (19:51 +0000)]
merge r6386-6388 from trunk

16 years agomerge r6384 from trunk
Dana Jansens [Sat, 12 May 2007 19:32:22 +0000 (19:32 +0000)]
merge r6384 from trunk

16 years agomerge r6382 from trunk
Dana Jansens [Sat, 12 May 2007 19:31:22 +0000 (19:31 +0000)]
merge r6382 from trunk

16 years agomerge r6380 from trunk
Dana Jansens [Sat, 12 May 2007 19:27:10 +0000 (19:27 +0000)]
merge r6380 from trunk

16 years agopoint to the right schema
Dana Jansens [Sat, 12 May 2007 19:10:29 +0000 (19:10 +0000)]
point to the right schema

16 years agomerge r6374-6376 from trunk
Dana Jansens [Sat, 12 May 2007 19:03:39 +0000 (19:03 +0000)]
merge r6374-6376 from trunk

16 years agomerge r6372 from trunk
Dana Jansens [Sat, 12 May 2007 18:44:38 +0000 (18:44 +0000)]
merge r6372 from trunk

16 years agothe changelog for the xsds is in svn now..also they are out of date.
Dana Jansens [Sat, 12 May 2007 18:21:11 +0000 (18:21 +0000)]
the changelog for the xsds is in svn now..also they are out of date.
point to the schemas in the right place

16 years agomissing a /
Dana Jansens [Sat, 12 May 2007 17:59:14 +0000 (17:59 +0000)]
missing a /

16 years agothere is no themerc.xml in 3.4
Dana Jansens [Sat, 12 May 2007 17:58:36 +0000 (17:58 +0000)]
there is no themerc.xml in 3.4