]> icculus.org git repositories - mikachu/openbox.git/log
mikachu/openbox.git
16 years agomerge 7329-34 from trunk
Dana Jansens [Mon, 4 Jun 2007 18:08:06 +0000 (18:08 +0000)]
merge 7329-34 from trunk

16 years agomerge r7327
Mikael Magnusson [Mon, 4 Jun 2007 10:45:28 +0000 (10:45 +0000)]
merge r7327

16 years agomerge 7324-25 from trunk
Dana Jansens [Mon, 4 Jun 2007 01:58:32 +0000 (01:58 +0000)]
merge 7324-25 from trunk

16 years agomerge r7322
Mikael Magnusson [Mon, 4 Jun 2007 01:22:56 +0000 (01:22 +0000)]
merge r7322

16 years agomerge 7320 from trunk
Dana Jansens [Sun, 3 Jun 2007 23:00:18 +0000 (23:00 +0000)]
merge 7320 from trunk

16 years agomissed merge
Dana Jansens [Sun, 3 Jun 2007 22:58:33 +0000 (22:58 +0000)]
missed merge

16 years agomissed merges
Dana Jansens [Sun, 3 Jun 2007 22:54:08 +0000 (22:54 +0000)]
missed merges

16 years agomerge r7316
Mikael Magnusson [Sun, 3 Jun 2007 22:52:08 +0000 (22:52 +0000)]
merge r7316

16 years agomerge 7314 from trunk
Dana Jansens [Sun, 3 Jun 2007 22:00:57 +0000 (22:00 +0000)]
merge 7314 from trunk

16 years agomerge r7309-7311 from trunk
Dana Jansens [Sun, 3 Jun 2007 21:31:49 +0000 (21:31 +0000)]
merge r7309-7311 from trunk

16 years agomerge r7296-7307 from trunk
Dana Jansens [Sun, 3 Jun 2007 20:40:21 +0000 (20:40 +0000)]
merge r7296-7307 from trunk

16 years agomerge r7288-7294 from trunk
Dana Jansens [Sun, 3 Jun 2007 19:37:10 +0000 (19:37 +0000)]
merge r7288-7294 from trunk

16 years agofree the new title separator colors
Dana Jansens [Sun, 3 Jun 2007 17:40:43 +0000 (17:40 +0000)]
free the new title separator colors

16 years agorevert change to clearlooks openbox-3_3_995-RELEASE
Dana Jansens [Sat, 2 Jun 2007 21:23:35 +0000 (21:23 +0000)]
revert change to clearlooks

16 years agomerge r7274 from trunk
Dana Jansens [Sat, 2 Jun 2007 21:23:15 +0000 (21:23 +0000)]
merge r7274 from trunk

16 years agomerge 7271
Dana Jansens [Sat, 2 Jun 2007 21:04:47 +0000 (21:04 +0000)]
merge 7271

16 years agolet the menu border be different than frame border..
Dana Jansens [Sat, 2 Jun 2007 21:04:34 +0000 (21:04 +0000)]
let the menu border be different than frame border..

16 years agoadd window.title.separator.width
Dana Jansens [Sat, 2 Jun 2007 20:53:19 +0000 (20:53 +0000)]
add window.title.separator.width

16 years agoadd window.client.padding.height to the default themes just cuz
Dana Jansens [Sat, 2 Jun 2007 20:41:05 +0000 (20:41 +0000)]
add window.client.padding.height to the default themes just cuz

16 years agoadd client.padding.height
Dana Jansens [Sat, 2 Jun 2007 20:36:33 +0000 (20:36 +0000)]
add client.padding.height

16 years agomerge r7243-7255 from trunk
Dana Jansens [Sat, 2 Jun 2007 19:18:30 +0000 (19:18 +0000)]
merge r7243-7255 from trunk

16 years agomerge r7264 from trunk
Dana Jansens [Sat, 2 Jun 2007 19:17:14 +0000 (19:17 +0000)]
merge r7264 from trunk

16 years agorename activedisabled to active.disabled
Dana Jansens [Sat, 2 Jun 2007 18:50:55 +0000 (18:50 +0000)]
rename activedisabled to active.disabled

16 years agorevert that. i am too lazy today
Dana Jansens [Sat, 2 Jun 2007 17:32:12 +0000 (17:32 +0000)]
revert that. i am too lazy today

16 years agoi should compile before commiting
Dana Jansens [Sat, 2 Jun 2007 17:31:24 +0000 (17:31 +0000)]
i should compile before commiting

16 years agorename menu.items.* to menu.*
Dana Jansens [Sat, 2 Jun 2007 17:31:02 +0000 (17:31 +0000)]
rename menu.items.* to menu.*

16 years agomake inactive window border inherit from active window border which inherits from...
Dana Jansens [Sat, 2 Jun 2007 15:48:57 +0000 (15:48 +0000)]
make inactive window border inherit from active window border which inherits from window.border

16 years agoallow negative menu overlap, the same as in trunk
Dana Jansens [Sat, 2 Jun 2007 15:38:28 +0000 (15:38 +0000)]
allow negative menu overlap, the same as in trunk

16 years agomerge r7241
Mikael Magnusson [Fri, 1 Jun 2007 21:37:10 +0000 (21:37 +0000)]
merge r7241

16 years agomerge r7212-7239 from trunk
Dana Jansens [Fri, 1 Jun 2007 16:35:32 +0000 (16:35 +0000)]
merge r7212-7239 from trunk

16 years agomerge r7209 from trunk
Dana Jansens [Fri, 1 Jun 2007 01:57:30 +0000 (01:57 +0000)]
merge r7209 from trunk

16 years agomerge r7198-99 from trunk
Dana Jansens [Thu, 31 May 2007 23:31:21 +0000 (23:31 +0000)]
merge r7198-99 from trunk

16 years agomerge r7196 from trunk
Dana Jansens [Thu, 31 May 2007 23:15:49 +0000 (23:15 +0000)]
merge r7196 from trunk

16 years agomerge r7194 from trunk
Dana Jansens [Thu, 31 May 2007 23:07:43 +0000 (23:07 +0000)]
merge r7194 from trunk

16 years agomerge r7186 from trunk
Dana Jansens [Thu, 31 May 2007 21:34:18 +0000 (21:34 +0000)]
merge r7186 from trunk

16 years agomerge r7182
Mikael Magnusson [Thu, 31 May 2007 20:07:08 +0000 (20:07 +0000)]
merge r7182

16 years agomerge r7171 from trunk
Dana Jansens [Thu, 31 May 2007 15:49:46 +0000 (15:49 +0000)]
merge r7171 from trunk

16 years agomerge r7168 from trunk
Dana Jansens [Thu, 31 May 2007 15:48:13 +0000 (15:48 +0000)]
merge r7168 from trunk

16 years agocleaner code for 3.4 too
Dana Jansens [Thu, 31 May 2007 15:45:02 +0000 (15:45 +0000)]
cleaner code for 3.4 too

16 years agofix bug!
Dana Jansens [Thu, 31 May 2007 15:43:38 +0000 (15:43 +0000)]
fix bug!

16 years agomerge r7162-7163 from trunk
Dana Jansens [Thu, 31 May 2007 15:42:14 +0000 (15:42 +0000)]
merge r7162-7163 from trunk

16 years agoremove the debug print
Dana Jansens [Wed, 30 May 2007 22:05:26 +0000 (22:05 +0000)]
remove the debug print

16 years agoadd a debug print for althaser
Dana Jansens [Wed, 30 May 2007 21:57:08 +0000 (21:57 +0000)]
add a debug print for althaser

16 years agomerge r7116-7120 from trunk
Dana Jansens [Wed, 30 May 2007 20:38:00 +0000 (20:38 +0000)]
merge r7116-7120 from trunk

16 years agomerge r7114 from trunk
Dana Jansens [Wed, 30 May 2007 19:17:23 +0000 (19:17 +0000)]
merge r7114 from trunk

16 years agomerge r7109 from trunk
Dana Jansens [Wed, 30 May 2007 17:56:10 +0000 (17:56 +0000)]
merge r7109 from trunk

16 years agomergicate r7106 from trunk
Mikael Magnusson [Wed, 30 May 2007 17:35:41 +0000 (17:35 +0000)]
mergicate r7106 from trunk

16 years agomissing left and right contexts
Dana Jansens [Wed, 30 May 2007 14:01:23 +0000 (14:01 +0000)]
missing left and right contexts

16 years agomerge r7100 from trunk
Dana Jansens [Wed, 30 May 2007 13:59:07 +0000 (13:59 +0000)]
merge r7100 from trunk

16 years agomerge r7097 from trunk
Dana Jansens [Wed, 30 May 2007 13:55:31 +0000 (13:55 +0000)]
merge r7097 from trunk

16 years agomerge r7086 from trunk
Dana Jansens [Wed, 30 May 2007 13:54:52 +0000 (13:54 +0000)]
merge r7086 from trunk

16 years agomerge r6958-7088 from trunk (mostly obconf commits which are ignored)
Dana Jansens [Wed, 30 May 2007 02:25:47 +0000 (02:25 +0000)]
merge r6958-7088 from trunk (mostly obconf commits which are ignored)

16 years agomerge r7055-7056 from trunk
Dana Jansens [Tue, 29 May 2007 21:07:28 +0000 (21:07 +0000)]
merge r7055-7056 from trunk

16 years agomerge r7035-7053 from trunk
Dana Jansens [Tue, 29 May 2007 20:48:24 +0000 (20:48 +0000)]
merge r7035-7053 from trunk

16 years agomerge r7033 from trunk
Dana Jansens [Tue, 29 May 2007 00:13:19 +0000 (00:13 +0000)]
merge r7033 from trunk

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

16 years agomerge r7029 from trunk
Dana Jansens [Mon, 28 May 2007 23:21:15 +0000 (23:21 +0000)]
merge r7029 from trunk

16 years agomerge r7022-7027 from trunk
Dana Jansens [Mon, 28 May 2007 23:17:30 +0000 (23:17 +0000)]
merge r7022-7027 from trunk

16 years agomerge r7019-7020 from trunk
Dana Jansens [Mon, 28 May 2007 21:09:40 +0000 (21:09 +0000)]
merge r7019-7020 from trunk

16 years agomerge r6996-7017 from trunk
Dana Jansens [Mon, 28 May 2007 20:11:21 +0000 (20:11 +0000)]
merge r6996-7017 from trunk

16 years agoadd chinese simplified translation on 3.4-working
Mikael Magnusson [Mon, 28 May 2007 06:00:00 +0000 (06:00 +0000)]
add chinese simplified translation on 3.4-working

16 years agomerge r6994 from trunk
Dana Jansens [Mon, 28 May 2007 04:26:44 +0000 (04:26 +0000)]
merge r6994 from trunk

16 years agomerge r6992 from trunk
Dana Jansens [Mon, 28 May 2007 04:20:14 +0000 (04:20 +0000)]
merge r6992 from trunk

16 years agomerge r6990 from trunk
Dana Jansens [Mon, 28 May 2007 04:19:09 +0000 (04:19 +0000)]
merge r6990 from trunk

16 years agomerge r6977-6988 from trunk
Dana Jansens [Mon, 28 May 2007 04:14:30 +0000 (04:14 +0000)]
merge r6977-6988 from trunk

16 years agomerge r6973-6975 from trunk
Dana Jansens [Mon, 28 May 2007 02:13:40 +0000 (02:13 +0000)]
merge r6973-6975 from trunk

16 years agomerge r6965-6971 from trunk
Dana Jansens [Mon, 28 May 2007 01:57:45 +0000 (01:57 +0000)]
merge r6965-6971 from trunk

16 years agomerge r6955-6963 from trunk
Dana Jansens [Sun, 27 May 2007 23:38:36 +0000 (23:38 +0000)]
merge r6955-6963 from trunk

16 years agomerge r6948-6953 from trunk
Dana Jansens [Sun, 27 May 2007 22:40:41 +0000 (22:40 +0000)]
merge r6948-6953 from trunk

16 years agoa missed and a failed merge
Mikael Magnusson [Sun, 27 May 2007 21:37:29 +0000 (21:37 +0000)]
a missed and a failed merge

16 years agomerge r6939-6945 from trunk
Dana Jansens [Sun, 27 May 2007 21:31:58 +0000 (21:31 +0000)]
merge r6939-6945 from trunk

16 years agomerge r6937 from trunk
Dana Jansens [Sun, 27 May 2007 14:51:40 +0000 (14:51 +0000)]
merge r6937 from trunk

16 years agomerge 6935 on 3.4, also nl.po seemed to be missing so add it too
Mikael Magnusson [Sun, 27 May 2007 14:40:45 +0000 (14:40 +0000)]
merge 6935 on 3.4, also nl.po seemed to be missing so add it too

16 years agomerge r6932 from trunk
Dana Jansens [Sun, 27 May 2007 05:08:02 +0000 (05:08 +0000)]
merge r6932 from trunk

16 years agomerge r6930 from trunk
Dana Jansens [Sun, 27 May 2007 04:16:29 +0000 (04:16 +0000)]
merge r6930 from trunk

16 years agomerge r6925-28 from trunk
Dana Jansens [Sun, 27 May 2007 03:46:37 +0000 (03:46 +0000)]
merge r6925-28 from trunk

16 years agomerge r6923 from trunk
Dana Jansens [Sat, 26 May 2007 23:13:03 +0000 (23:13 +0000)]
merge r6923 from trunk

16 years agomerge r6920-21 from trunk
Dana Jansens [Sat, 26 May 2007 23:10:26 +0000 (23:10 +0000)]
merge r6920-21 from trunk

16 years agomerge r6918 from trunk
Dana Jansens [Sat, 26 May 2007 22:42:04 +0000 (22:42 +0000)]
merge r6918 from trunk

16 years agocopy po/ from trunk, it wasn't building
Dana Jansens [Sat, 26 May 2007 22:32:54 +0000 (22:32 +0000)]
copy po/ from trunk, it wasn't building

16 years agomerge r6904-6915 from trunk
Dana Jansens [Sat, 26 May 2007 22:29:33 +0000 (22:29 +0000)]
merge r6904-6915 from trunk

16 years agomerge r6902 from trunk
Dana Jansens [Sat, 26 May 2007 20:37:14 +0000 (20:37 +0000)]
merge r6902 from trunk

16 years agomerge r6900 from trunk
Dana Jansens [Sat, 26 May 2007 19:58:34 +0000 (19:58 +0000)]
merge r6900 from trunk

16 years agomerge r6898 from trunk
Dana Jansens [Sat, 26 May 2007 19:52:34 +0000 (19:52 +0000)]
merge r6898 from trunk

16 years agomerge r6895-6896 from trunk
Dana Jansens [Sat, 26 May 2007 19:51:20 +0000 (19:51 +0000)]
merge r6895-6896 from trunk

16 years agomerge r6892-6893 from trunk
Dana Jansens [Sat, 26 May 2007 17:36:34 +0000 (17:36 +0000)]
merge r6892-6893 from trunk

16 years agomerge r6881-6890 from trunk
Dana Jansens [Sat, 26 May 2007 16:25:41 +0000 (16:25 +0000)]
merge r6881-6890 from trunk

16 years agomerge r6875-6879 from trunk, and add nl to LINGUAS
Dana Jansens [Sat, 26 May 2007 01:01:07 +0000 (01:01 +0000)]
merge r6875-6879 from trunk, and add nl to LINGUAS

16 years agomerge r6866-6873 from trunk openbox-3_3_994-RELEASE
Dana Jansens [Fri, 25 May 2007 21:43:35 +0000 (21:43 +0000)]
merge r6866-6873 from trunk

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

17 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

17 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

17 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

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

17 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

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

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

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

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