# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1265755148 0
# Node ID 1140ced9b4f6a8634fedab070cc731fd59f53ce3
# Parent  b052a711cfbda7a762dcb52b8decdb8005944670# Parent  d780d89dc079ca8c89bfbac916ac99401b2a9c94
merge of '88e861487c0bb038a99ebb6d7675ae45f749e799'
     and 'c7a31c2a657883fbaf9577a5d0fd7c2b7731e207'

diff -r b052a711cfbd -r 1140ced9b4f6 libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Tue Feb 09 22:07:48 2010 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Tue Feb 09 22:39:08 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;