# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1265835212 0
# Node ID 5b1b7c5393f66abeb6b02731054f969ad0ee48f5
# Parent  5d56c0dd2810a827cb2023c8ef8477746664bea5# Parent  1140ced9b4f6a8634fedab070cc731fd59f53ce3
merge of 'f14dddd03f189029f2313c234b5e9dc9964b8fa8'
     and 'f7ee01128f9373b2d98f537af9109a36acc58d1e'

diff -r 5d56c0dd2810 -r 5b1b7c5393f6 libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Wed Feb 10 20:53:18 2010 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Wed Feb 10 20:53:32 2010 +0000
@@ -378,6 +378,8 @@
 	OSCAR_CAPABILITY_NEWCAPS              = 0x20000000,
 	OSCAR_CAPABILITY_XTRAZ                = 0x40000000,
 	OSCAR_CAPABILITY_GENERICUNKNOWN       = 0x80000000,
+#warning Fix OSCAR_CAPABILITY_LAST situation
+	// TODO: We're out of bits.  Rework things that depend on this or remove some capability. (Or, ensure this is a 64-bit type.)
 	OSCAR_CAPABILITY_LAST                 = 0x100000000	
 } OscarCapability;