Dana Jansens [Fri, 4 May 2007 23:18:35 +0000 (23:18 +0000)]
bad merging.. why did it make conflicts? i dunno
Dana Jansens [Fri, 4 May 2007 23:16:47 +0000 (23:16 +0000)]
merge r6042 from trunk
Dana Jansens [Fri, 4 May 2007 23:15:47 +0000 (23:15 +0000)]
add from trunk r6041
Dana Jansens [Fri, 4 May 2007 22:51:24 +0000 (22:51 +0000)]
merge r6039 from trunk
Dana Jansens [Fri, 4 May 2007 17:57:30 +0000 (17:57 +0000)]
same as r6037 in trunk
Dana Jansens [Fri, 4 May 2007 16:14:31 +0000 (16:14 +0000)]
same as r6035 from trunk
Dana Jansens [Fri, 4 May 2007 07:21:47 +0000 (07:21 +0000)]
merge r6031-6032 from trunk
Dana Jansens [Fri, 4 May 2007 04:48:03 +0000 (04:48 +0000)]
merge r6029 from trunk
Dana Jansens [Fri, 4 May 2007 04:29:06 +0000 (04:29 +0000)]
merge r6020-6025 from trunk
Dana Jansens [Fri, 4 May 2007 04:28:28 +0000 (04:28 +0000)]
copy the grouptrancircular test in from trunk
Dana Jansens [Fri, 4 May 2007 04:28:06 +0000 (04:28 +0000)]
copy the stacking test in
Dana Jansens [Fri, 4 May 2007 02:48:56 +0000 (02:48 +0000)]
merge r6016-6018 from trunk
Dana Jansens [Fri, 4 May 2007 01:35:50 +0000 (01:35 +0000)]
merge r6014 from trunk
Dana Jansens [Fri, 4 May 2007 01:11:09 +0000 (01:11 +0000)]
merge r6012 from trunk
Dana Jansens [Thu, 3 May 2007 20:57:55 +0000 (20:57 +0000)]
same as r6010 in trunk
Dana Jansens [Thu, 3 May 2007 20:40:17 +0000 (20:40 +0000)]
same thing as r6008 in trunk
Dana Jansens [Thu, 3 May 2007 04:33:30 +0000 (04:33 +0000)]
merge r6006 from trunk. 6006 was supposed to say stop an assert from fireing on shutdown
Dana Jansens [Thu, 3 May 2007 04:29:04 +0000 (04:29 +0000)]
merge r6004 from trunk
Dana Jansens [Thu, 3 May 2007 04:24:15 +0000 (04:24 +0000)]
merge r6002 from trunk
Dana Jansens [Thu, 3 May 2007 04:21:38 +0000 (04:21 +0000)]
merge lucky r6000 from trunk
Dana Jansens [Thu, 3 May 2007 03:19:30 +0000 (03:19 +0000)]
merge r5996-5998 from trunk
Dana Jansens [Thu, 3 May 2007 00:51:28 +0000 (00:51 +0000)]
merge r5994 from trunk
Dana Jansens [Wed, 2 May 2007 23:44:04 +0000 (23:44 +0000)]
merge r5991-5992 from trunk
Dana Jansens [Wed, 2 May 2007 23:04:13 +0000 (23:04 +0000)]
merge r5989 from trunk
Dana Jansens [Wed, 2 May 2007 21:54:01 +0000 (21:54 +0000)]
merge r5987 from trunk (using old themerc files)
Mikael Magnusson [Wed, 2 May 2007 20:22:36 +0000 (20:22 +0000)]
merge the incredibly important revisions 5984,5985 from trunk
Dana Jansens [Wed, 2 May 2007 04:06:21 +0000 (04:06 +0000)]
merge r5980-5981 from trunk (using old themerc files)
Dana Jansens [Wed, 2 May 2007 03:44:58 +0000 (03:44 +0000)]
not themerc.xml
Dana Jansens [Wed, 2 May 2007 03:44:23 +0000 (03:44 +0000)]
merge r5977 from trunk (using old themerc files)
Dana Jansens [Wed, 2 May 2007 03:11:35 +0000 (03:11 +0000)]
merge r5968-5975 from trunk
Dana Jansens [Tue, 1 May 2007 12:19:11 +0000 (12:19 +0000)]
merge r5966 from trunk
Dana Jansens [Tue, 1 May 2007 05:05:56 +0000 (05:05 +0000)]
add the missing README.SVN from head
Dana Jansens [Tue, 1 May 2007 05:04:56 +0000 (05:04 +0000)]
merge r5956-5963 from trunk
Dana Jansens [Thu, 26 Apr 2007 16:43:40 +0000 (16:43 +0000)]
merge r5954 from trunk
Dana Jansens [Thu, 26 Apr 2007 13:11:38 +0000 (13:11 +0000)]
merge r5952 from trunk
Dana Jansens [Thu, 26 Apr 2007 06:14:35 +0000 (06:14 +0000)]
merge r5950 from trunk
Dana Jansens [Thu, 26 Apr 2007 06:10:45 +0000 (06:10 +0000)]
merge r5948 from trunk
Dana Jansens [Thu, 26 Apr 2007 06:00:09 +0000 (06:00 +0000)]
merge r5946 from trunk
Dana Jansens [Thu, 26 Apr 2007 05:39:39 +0000 (05:39 +0000)]
merge r5944 from trunk
Dana Jansens [Thu, 26 Apr 2007 05:09:18 +0000 (05:09 +0000)]
merge r5928-5942 from trunk
Dana Jansens [Wed, 25 Apr 2007 18:26:49 +0000 (18:26 +0000)]
merge r5925-5926 from trunk
Mikael Magnusson [Wed, 25 Apr 2007 15:45:36 +0000 (15:45 +0000)]
merge r5923 from trunk
Dana Jansens [Wed, 25 Apr 2007 14:15:51 +0000 (14:15 +0000)]
merge r5921 from trunk
Mikael Magnusson [Wed, 25 Apr 2007 14:05:31 +0000 (14:05 +0000)]
merge r5919 from trunk
Dana Jansens [Wed, 25 Apr 2007 04:12:19 +0000 (04:12 +0000)]
merge r5913-5917 from trunk
Dana Jansens [Wed, 25 Apr 2007 02:57:03 +0000 (02:57 +0000)]
fix po's
Dana Jansens [Wed, 25 Apr 2007 02:56:39 +0000 (02:56 +0000)]
merge r5899-5910 from trunk
Dana Jansens [Tue, 24 Apr 2007 21:09:33 +0000 (21:09 +0000)]
merge r5897 from trunk
Dana Jansens [Tue, 24 Apr 2007 20:48:46 +0000 (20:48 +0000)]
merge r5895 from trunk
Dana Jansens [Tue, 24 Apr 2007 20:42:52 +0000 (20:42 +0000)]
merge r5893 from trunk
Dana Jansens [Tue, 24 Apr 2007 20:40:28 +0000 (20:40 +0000)]
merge r5891 from trunk
Dana Jansens [Tue, 24 Apr 2007 19:58:50 +0000 (19:58 +0000)]
merge r5888-5889 from trunk
Dana Jansens [Tue, 24 Apr 2007 19:27:47 +0000 (19:27 +0000)]
merge r5885-5886 from trunk
Mikael Magnusson [Tue, 24 Apr 2007 18:47:00 +0000 (18:47 +0000)]
merge r5883 from trunk
Dana Jansens [Tue, 24 Apr 2007 18:39:54 +0000 (18:39 +0000)]
merge r5876-5881 from trunk
Dana Jansens [Tue, 24 Apr 2007 15:59:24 +0000 (15:59 +0000)]
merge r5875 from trunk
Dana Jansens [Tue, 24 Apr 2007 15:32:04 +0000 (15:32 +0000)]
merge r5872,5873 from trunk
Dana Jansens [Tue, 24 Apr 2007 14:39:32 +0000 (14:39 +0000)]
merge r5755 from trunk
Dana Jansens [Tue, 24 Apr 2007 14:27:50 +0000 (14:27 +0000)]
merge r5867 from trunk
Dana Jansens [Tue, 24 Apr 2007 14:22:46 +0000 (14:22 +0000)]
merge r5863-5865 from trunk
Dana Jansens [Tue, 24 Apr 2007 07:09:58 +0000 (07:09 +0000)]
merge r5861 from trunk
Dana Jansens [Tue, 24 Apr 2007 07:07:29 +0000 (07:07 +0000)]
merge r5815-5828,5832-5859 from trunk
Mikael Magnusson [Mon, 23 Apr 2007 19:10:45 +0000 (19:10 +0000)]
merge r5829,r5830 to 3.4-working
Dana Jansens [Sun, 22 Apr 2007 22:58:52 +0000 (22:58 +0000)]
merge r5808-5813 from trunk
Dana Jansens [Sun, 22 Apr 2007 20:43:45 +0000 (20:43 +0000)]
merge r5799-5806 from trunk
Dana Jansens [Sun, 22 Apr 2007 19:27:47 +0000 (19:27 +0000)]
merge r5797 from trunk
Dana Jansens [Sun, 22 Apr 2007 19:15:27 +0000 (19:15 +0000)]
merge r5788-r5790,r5792-r5795 from trunk
Dana Jansens [Sun, 22 Apr 2007 16:01:12 +0000 (16:01 +0000)]
merge r5782,r5785,r5786 from trunk
Dana Jansens [Sun, 22 Apr 2007 14:16:50 +0000 (14:16 +0000)]
merge r5780 from trunk
Dana Jansens [Sun, 22 Apr 2007 14:11:42 +0000 (14:11 +0000)]
merge r5777-r5778 from trunk
Dana Jansens [Sun, 22 Apr 2007 04:43:10 +0000 (04:43 +0000)]
merge r5774-r5775 from trunk
Dana Jansens [Sun, 22 Apr 2007 04:28:43 +0000 (04:28 +0000)]
merge r5765-r5772 from trunk (this was non-trivial)
Dana Jansens [Sun, 22 Apr 2007 02:13:40 +0000 (02:13 +0000)]
merge r5761-r5763 from trunk
Dana Jansens [Sun, 22 Apr 2007 00:37:38 +0000 (00:37 +0000)]
merge r5756-r5759 from trunk
Dana Jansens [Sat, 21 Apr 2007 22:07:08 +0000 (22:07 +0000)]
merge r5753 from trunk
Dana Jansens [Sat, 21 Apr 2007 21:40:21 +0000 (21:40 +0000)]
merge r5750-r5751 from trunk
Dana Jansens [Sat, 21 Apr 2007 21:05:24 +0000 (21:05 +0000)]
merge r5748 from trunk
Dana Jansens [Fri, 20 Apr 2007 05:23:09 +0000 (05:23 +0000)]
merge r5746 from trunk
Dana Jansens [Wed, 18 Apr 2007 19:25:45 +0000 (19:25 +0000)]
merge r5742-5744 from trunk
Dana Jansens [Wed, 18 Apr 2007 17:18:57 +0000 (17:18 +0000)]
merge r5740 from trunk
Dana Jansens [Fri, 13 Apr 2007 14:43:56 +0000 (14:43 +0000)]
merge r5732-5737 from trunk
Mikael Magnusson [Thu, 12 Apr 2007 21:10:16 +0000 (21:10 +0000)]
mysterious typo
Dana Jansens [Thu, 5 Apr 2007 04:00:02 +0000 (04:00 +0000)]
merge r5730 from trunk
Dana Jansens [Fri, 30 Mar 2007 18:29:56 +0000 (18:29 +0000)]
merge r5728 from trunk
Dana Jansens [Fri, 30 Mar 2007 16:20:00 +0000 (16:20 +0000)]
merge r5725 from trunk
Mikael Magnusson [Fri, 30 Mar 2007 09:58:15 +0000 (09:58 +0000)]
merge r5723 from trunk
Dana Jansens [Fri, 30 Mar 2007 04:38:45 +0000 (04:38 +0000)]
merge r5721 from trunk
Mikael Magnusson [Wed, 28 Mar 2007 19:58:58 +0000 (19:58 +0000)]
merge r5719 from trunk
Mikael Magnusson [Wed, 28 Mar 2007 19:47:19 +0000 (19:47 +0000)]
merge r5716,r5717 from trunk
Mikael Magnusson [Wed, 28 Mar 2007 17:11:09 +0000 (17:11 +0000)]
merge r5713 from trunk
Dana Jansens [Wed, 28 Mar 2007 06:02:11 +0000 (06:02 +0000)]
merge r5711 from trunk
Dana Jansens [Wed, 28 Mar 2007 04:12:10 +0000 (04:12 +0000)]
back out changes to drawing toggled buttons. leave it how it used to be in 3.3.1 for now, to do it right you need the xml theme additions.
Dana Jansens [Wed, 28 Mar 2007 04:09:25 +0000 (04:09 +0000)]
merge r5708 from trunk
Mikael Magnusson [Wed, 28 Mar 2007 03:44:46 +0000 (03:44 +0000)]
merge r5704 from trunk
Mikael Magnusson [Wed, 28 Mar 2007 01:57:36 +0000 (01:57 +0000)]
merge r5701 and r5702 from trunk (i also meant trunk earlier when i said HEAD)
Mikael Magnusson [Wed, 28 Mar 2007 01:33:47 +0000 (01:33 +0000)]
just for fun, merge r5699 from HEAD
Dana Jansens [Mon, 26 Mar 2007 03:18:30 +0000 (03:18 +0000)]
set the shadow colors/alphas in the appearances
Dana Jansens [Mon, 26 Mar 2007 03:18:12 +0000 (03:18 +0000)]
old themes for 3.4 release
Mikael Magnusson [Sun, 25 Mar 2007 19:31:16 +0000 (19:31 +0000)]
and remove them here
Dana Jansens [Sun, 25 Mar 2007 19:14:01 +0000 (19:14 +0000)]
reverting to using the old themes.
shadow information is read out of the font strings, even though the fonts are not.
projects / dana / openbox.git / log