[tuhopuu-devel] State of the merge

[Matt Ebb]

--Apple-Mail-2--1029782314
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed


On 4 Jul 2004, at 4:17 PM, Chris Want wrote:

> broken:
>   * source/blender/src/space.c
>     -- user pref stuff, especially mouse button  ... I went with bf 
> mainly

Seems all clear so far.

Cheers and thanks

--Apple-Mail-2--1029782314
Content-Transfer-Encoding: base64
Content-Type: application/pkcs7-signature;
	name=smime.p7s
Content-Disposition: attachment;
	filename=smime.p7s

MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIGDjCCAscw
ggIwoAMCAQICAwxG8zANBgkqhkiG9w0BAQQFADBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhh
d3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVt
YWlsIElzc3VpbmcgQ0EwHhcNMDQwNTA5MTQ1NzQyWhcNMDUwNTA5MTQ1NzQyWjA/MR8wHQYDVQQD
ExZUaGF3dGUgRnJlZW1haWwgTWVtYmVyMRwwGgYJKoZIhvcNAQkBFg1tYXR0QG1rZTMubmV0MIIB
IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrMXJq+m7wZA9sqdK/9puxi3rdgyb6+pvVOT
+WoJ8AA5dEGJPRS67OA0Kp2P7O75FJuQljY3zTquUg3pgHQId+8SyaCYjERsrkj0jTrWN9IwiDHm
xrgqiXWa1kuHOKPAER+uorJmGwHIhlV9gvJMNXf8wOmARTfKAO4kYQ4ZjHG9LYXIomDni3EmF6ZR
cqoh4RqQ9l/CnP9REcxfSNSUYw1QgOjJpU27T5QAVxY4Rq1zrHXWCNHGjWt5Hx8AGuCnr8J7n2OD
0m6bdEIp611qWaxJcHpU8za8huQeae5BSgSnu7jc0S004LFlTqM+0SpyHYqWLZxQC1p8hIcJZEe6
iQIDAQABoyowKDAYBgNVHREEETAPgQ1tYXR0QG1rZTMubmV0MAwGA1UdEwEB/wQCMAAwDQYJKoZI
hvcNAQEEBQADgYEAsqN85XImlc6lXdYOT68vBOCseU6Su+W3NuTb7E3wdBq2RTjSIHo8jZRi3nY9
OjLHCNFqCdJ3sWMqSi6G1b77YHkfUlEXB4fTl5nasfbtzhMUVdDtIlwP8z/rgqzIhj9WaT6oE0oZ
Fmen9qA+zC1yoqymsW0gD5pNBliMgmou6HYwggM/MIICqKADAgECAgENMA0GCSqGSIb3DQEBBQUA
MIHRMQswCQYDVQQGEwJaQTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRv
d24xGjAYBgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNl
cnZpY2VzIERpdmlzaW9uMSQwIgYDVQQDExtUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgQ0ExKzAp
BgkqhkiG9w0BCQEWHHBlcnNvbmFsLWZyZWVtYWlsQHRoYXd0ZS5jb20wHhcNMDMwNzE3MDAwMDAw
WhcNMTMwNzE2MjM1OTU5WjBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRp
bmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3Vpbmcg
Q0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSmPFVzVftOucqZWh5owHUEcJ3f6f+jHuy9
zfVb8hp2vX8MOmHyv1HOAdTlUAow1wJjWiyJFXCO3cnwK4Vaqj9xVsuvPAsH5/EfkTYkKhPPK9Xz
gnc9A74r/rsYPge/QIACZNenprufZdHFKlSFD0gEf6e20TxhBEAeZBlyYLf7AgMBAAGjgZQwgZEw
EgYDVR0TAQH/BAgwBgEB/wIBADBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLnRoYXd0ZS5j
b20vVGhhd3RlUGVyc29uYWxGcmVlbWFpbENBLmNybDALBgNVHQ8EBAMCAQYwKQYDVR0RBCIwIKQe
MBwxGjAYBgNVBAMTEVByaXZhdGVMYWJlbDItMTM4MA0GCSqGSIb3DQEBBQUAA4GBAEiM0VCD6gsu
zA2jZqxnD3+vrL7CF6FDlpSdf0whuPg2H6otnzYvwPQcUCCTcDz9reFhYsPZOhl+hLGZGwDFGguC
dJ4lUJRix9sncVcljd2pnDmOjCBPZV+V2vf3h9bGCE6u9uo05RAaWzVNd+NWIXiC3CEZNd4ksdMd
Rv9dX2VPMYIC5zCCAuMCAQEwaTBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1
bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3Vp
bmcgQ0ECAwxG8zAJBgUrDgMCGgUAoIIBUzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqG
SIb3DQEJBTEPFw0wNDA3MDQxMzA5MjZaMCMGCSqGSIb3DQEJBDEWBBQJCcocp4BqTe9jPBpxMtNZ
yjRZ8TB4BgkrBgEEAYI3EAQxazBpMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29u
c3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNz
dWluZyBDQQIDDEbzMHoGCyqGSIb3DQEJEAILMWugaTBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMc
VGhhd3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZy
ZWVtYWlsIElzc3VpbmcgQ0ECAwxG8zANBgkqhkiG9w0BAQEFAASCAQB7BRGscGPCrXalJBmTn4uK
HIBrABullMYjlDv0DRENLaKYrxgeDsH5HDG8gOTI+PSCKdJphy3MOTiGjBog/s5lnVFA8jcQ1f51
6UDhSwDOXo1vUs2tJiJ6JEOM1pOWNdmgE3rpLZemWtXfv/DZU5po9/oIvodeFxfSb0TNv9tTStyT
5C8JrVor8sRQpjEWJgQksWT3C7xU9sHd0Raugowy6+GWLq9s493BR4hws+KKdb362JAG2VqOuEQH
wyw607jMi2iH1FG2HtJrPtFe0nd+YUdIn6QUGk2TTJHWXmRgtIxnbU1EJDBpDVASv/r8jYwUpHdl
7AjOTfumIYvprwF/AAAAAAAA

--Apple-Mail-2--1029782314--