annotate STATUS @ 1373:ed1f47853bd4

[gaim-migrate @ 1383] erg committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 04 Jan 2001 22:32:54 +0000
parents 83f78eb7c472
children 11d21829ea3b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1346
83f78eb7c472 [gaim-migrate @ 1356]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1334
diff changeset
1 STATUS of GAIM CVS tree. Last modified $Date: 2000-12-21 08:56:59 -0500 (Thu, 21 Dec 2000) $ by $Author: warmenhoven $.
960
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
2
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
3 This file is meant to provide gaim users who use the CVS version to see whether
996
388ac74f4212 [gaim-migrate @ 1006]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 966
diff changeset
4 they actually want to compile what they just checked out. Gaim CVS is usually
960
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
5 relatively stable (we use it all the time), but has tendencies to be quirky at
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
6 times.
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
7
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
8
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
9 OVERALL
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
10 =======
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
11
1114
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
12 The current CVS tree is more or less back to "normal". It seems to be stable,
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
13 and allows multiple connections (which should also be stable).
960
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
14
1114
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
15 There have been a lot of changes in the past month; I think all of the bugs
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
16 have been worked out but I'm sure there are still a lot remaining. Please, if
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
17 you get bored one day, go on a big bug hunt.
960
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
18
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
19
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
20 MULTIPLE CONNECTIONS
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
21 ====================
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
22
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
23 I'm impressed that this is working. It took a major restructuring of the
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
24 internals of gaim. Everything had been based around one connection, and that
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
25 connection used one protocol or the other. Now, there are many connections, and
1114
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
26 each connection may be using a different protocol. This change should be nearing
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
27 completion now; most things are working and there are very few FIXME's related
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
28 to multiple connections left.
960
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
29
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
30
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
31 BUDDY LIST
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
32 ==========
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
33
1114
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
34 The buddy list should now be stable. The only thing that'll be missing is if
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
35 you're signed on as more than one name, the tooltips and idle times for buddies
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
36 won't display correctly.
960
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
37
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
38
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
39 Applet
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
40 ======
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
41
1114
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
42 The applet should be stable and completely functional now (as far as the applet
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
43 part of it goes).
960
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
44
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
45
1001
b8a819390499 [gaim-migrate @ 1011]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 996
diff changeset
46 Plugins
b8a819390499 [gaim-migrate @ 1011]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 996
diff changeset
47 =======
b8a819390499 [gaim-migrate @ 1011]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 996
diff changeset
48
1114
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
49 The plugin system got a good reworking. It's got a few more features now. Nearly
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
50 every plugin is going to need to be rewritten. Have fun porting from 0.10.x to
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
51 0.11.0 (it's actually very simple).
1038
daad2440a642 [gaim-migrate @ 1048]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1030
diff changeset
52
960
fa681641643d [gaim-migrate @ 970]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
53
1001
b8a819390499 [gaim-migrate @ 1011]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 996
diff changeset
54 Perl
b8a819390499 [gaim-migrate @ 1011]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 996
diff changeset
55 ====
b8a819390499 [gaim-migrate @ 1011]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 996
diff changeset
56
1114
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
57 Perl also got a good reworking, but also has a few more features now. Again,
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
58 porting from 0.10.x to 0.11.0 should be simple, but read the docs to see what's
c61f9c384413 [gaim-migrate @ 1124]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1065
diff changeset
59 going on.
1220
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
60
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
61
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
62 TOC
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
63 ===
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
64
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
65 TOC is working reasonably well. The options to use a proxy got moved to the
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
66 account editor, and are set up on a per-account basis, in case you were
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
67 wondering. TOC can be used to sign into ICQ; though you should use the ICQ
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
68 plugin as it offers more functionality.
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
69
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
70
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
71 Oscar
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
72 =====
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
73
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
74 Oscar is working reasonably well. Please see gaim/libfaim/README.gaim for more
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
75 details on Oscar. Oscar can be used to sign into ICQ; though you should use the
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
76 ICQ plugin as it offers more functionality.
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
77
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
78
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
79 Yahoo
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
80 =====
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
81
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
82 Yahoo currently supports signing on/off, changing status (only to user-defined
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
83 so far though), checking other people's status (via right-clicking in the
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
84 buddy list), and sending/receiving messages. Chat support is planned but not
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
85 yet implemented.
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
86
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
87
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
88 IRC
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
89 ===
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
90
1226
ec046fc9fc7a [gaim-migrate @ 1236]
Rob Flynn <gaim@robflynn.com>
parents: 1220
diff changeset
91 IRC currently supports signing on/off, sending and receiving messages,
ec046fc9fc7a [gaim-migrate @ 1236]
Rob Flynn <gaim@robflynn.com>
parents: 1220
diff changeset
92 joining chat rooms and holding conversations within them. The buddylist
ec046fc9fc7a [gaim-migrate @ 1236]
Rob Flynn <gaim@robflynn.com>
parents: 1220
diff changeset
93 also works and users have the ability to send ping requests to the user
ec046fc9fc7a [gaim-migrate @ 1236]
Rob Flynn <gaim@robflynn.com>
parents: 1220
diff changeset
94 by right clicking their name. /me support is also added. Other commands
ec046fc9fc7a [gaim-migrate @ 1236]
Rob Flynn <gaim@robflynn.com>
parents: 1220
diff changeset
95 and functionality are planned but not yet implemented.
1220
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
96
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
97
1259
7db9121aac80 [gaim-migrate @ 1269]
Rob Flynn <gaim@robflynn.com>
parents: 1226
diff changeset
98 MSN
7db9121aac80 [gaim-migrate @ 1269]
Rob Flynn <gaim@robflynn.com>
parents: 1226
diff changeset
99 ===
7db9121aac80 [gaim-migrate @ 1269]
Rob Flynn <gaim@robflynn.com>
parents: 1226
diff changeset
100
1275
de3339e2a0c4 [gaim-migrate @ 1285]
Rob Flynn <gaim@robflynn.com>
parents: 1259
diff changeset
101 MSN currently supports signing on/off, sending and receiving messages. The
1321
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
102 buddylist is functional. It also supports permit/deny lists and going
1278
b319e507a36a [gaim-migrate @ 1288]
Rob Flynn <gaim@robflynn.com>
parents: 1277
diff changeset
103 away/idle.
b319e507a36a [gaim-migrate @ 1288]
Rob Flynn <gaim@robflynn.com>
parents: 1277
diff changeset
104
1327
113a3d16f1ce [gaim-migrate @ 1337]
Rob Flynn <gaim@robflynn.com>
parents: 1321
diff changeset
105 When sending the initial message (to start a conversation) there will be a
113a3d16f1ce [gaim-migrate @ 1337]
Rob Flynn <gaim@robflynn.com>
parents: 1321
diff changeset
106 small delay. It will appear as if the client has frozen. This will not
113a3d16f1ce [gaim-migrate @ 1337]
Rob Flynn <gaim@robflynn.com>
parents: 1321
diff changeset
107 always be the case. I have a fix that I havent taken the time to write yet.
1259
7db9121aac80 [gaim-migrate @ 1269]
Rob Flynn <gaim@robflynn.com>
parents: 1226
diff changeset
108
7db9121aac80 [gaim-migrate @ 1269]
Rob Flynn <gaim@robflynn.com>
parents: 1226
diff changeset
109
1220
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
110 ICQ
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
111 ===
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
112
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
113 ICQ currently supports signing on/off, changing status (icq-away == aim-idle,
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
114 icq-n/a == aim-away), checking other people's status (but not status message),
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
115 sending/receiving messages, and receiving URLs. Keepalives are sent regardless
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
116 of whether or not you want them; it's necessary since it's a UDP protocol.
16ea7a3fdbb6 [gaim-migrate @ 1230]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1114
diff changeset
117 Chat and file transfer are planned but not yet implemented.
1311
338b8ac6bdab [gaim-migrate @ 1321]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1278
diff changeset
118
338b8ac6bdab [gaim-migrate @ 1321]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1278
diff changeset
119
338b8ac6bdab [gaim-migrate @ 1321]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1278
diff changeset
120 Jabber
338b8ac6bdab [gaim-migrate @ 1321]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1278
diff changeset
121 ======
338b8ac6bdab [gaim-migrate @ 1321]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1278
diff changeset
122
1346
83f78eb7c472 [gaim-migrate @ 1356]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1334
diff changeset
123 Jabber can sign on/off, send/receive messages, and add/remove buddies. All good
83f78eb7c472 [gaim-migrate @ 1356]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1334
diff changeset
124 things. If you have a registered transport then you can still use that; however
83f78eb7c472 [gaim-migrate @ 1356]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1334
diff changeset
125 you won't see it on your buddy list yet; and you can't add or remove transports
83f78eb7c472 [gaim-migrate @ 1356]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1334
diff changeset
126 yet. To use it, set your username to be name@server/resource; the reason for
83f78eb7c472 [gaim-migrate @ 1356]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1334
diff changeset
127 this is so that your resource becomes a part of your name and you can sign in
83f78eb7c472 [gaim-migrate @ 1356]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1334
diff changeset
128 to jabber using the same account more than once.
1321
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
129
1328
49d2eb2baf02 [gaim-migrate @ 1338]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 1327
diff changeset
130
1321
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
131 Napster
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
132 =======
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
133
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
134 Heh. Ok, so I (Rob) am on crack! Gaim can sign on/off of Napster, add/remove
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
135 people to your hotlist (buddylist) as well as chat privately and in chat rooms.
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
136 Hopefully I'll come up with a good way to do the file transfer stuff.
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
137
413121dcf7e9 [gaim-migrate @ 1331]
Rob Flynn <gaim@robflynn.com>
parents: 1311
diff changeset
138