merge
authorNikita Kozlov <nikita@mbdsys.com>
Sun, 05 Dec 2010 18:45:47 +0100
changeset 811 6cbb9b3117b7
parent 809 2655ee22df9f
child 812 9d3a7af41ec2
merge
.hgignore
.hgtags
AndroidManifest.xml
COPYING
CREDITS
INSTALL
README
build.properties
build.xml
default.properties
doc/UmlGraph.jar
doc/android/package-list
doc/asmack-beem/README.txt
doc/asmack-beem/beem-build-process.patch
doc/asmack-beem/beem_patches/50-fix-chatmanager.patch
doc/asmack-beem/beem_patches/50-fix-sasl-incorrect-encoding.patch
doc/asmack-beem/beem_patches/50-public-info-features.patch
doc/asmack-beem/beem_patches/COPYING
doc/asmack-beem/beem_patches/README.txt
doc/favicon.ico
doc/smack/package-list
libs/README.txt
libs/asmack-android-7-beem.jar
res/anim/rotate_and_scale.xml
res/drawable-hdpi/beem_icon_launcher_color.png
res/drawable-ldpi/beem_icon_launcher_color.png
res/drawable-mdpi/beem_icon_launcher_color.png
res/drawable/background.png
res/drawable/beem_launcher_icon_silver.png
res/drawable/beem_status_icon.png
res/drawable/bottombar.png
res/drawable/button_indicator_next.png
res/drawable/button_indicator_prev.png
res/drawable/ic_menu_add.png
res/drawable/ic_menu_blocked_user.png
res/drawable/ic_menu_chat_dashboard.png
res/drawable/ic_menu_close_clear_cancel.png
res/drawable/ic_menu_end_conversation.png
res/drawable/ic_menu_friendslist.png
res/drawable/ic_menu_invite.png
res/drawable/ic_menu_login.png
res/drawable/ic_menu_manage.png
res/drawable/icon.png
res/drawable/logo.png
res/drawable/not_in_the_roster.png
res/drawable/scrollbar_vertical_thumb.xml
res/drawable/scrollbar_vertical_track.xml
res/drawable/shape_border_green.xml
res/drawable/shape_line_green.xml
res/drawable/status_available.png
res/drawable/status_away.png
res/drawable/status_blocked.png
res/drawable/status_dnd.png
res/drawable/status_error.png
res/drawable/status_icon.xml
res/drawable/status_idle.png
res/drawable/status_invisible.png
res/drawable/status_new_message.png
res/drawable/status_offline.png
res/drawable/status_requested.png
res/drawable/status_typing.png
res/layout/addcontact.xml
res/layout/changestatus.xml
res/layout/chat.xml
res/layout/chat_msg_row.xml
res/layout/contactdialogaliasdialog.xml
res/layout/contactlist.xml
res/layout/contactlist_group.xml
res/layout/contactlist_groupstub.xml
res/layout/contactlistcontact.xml
res/layout/create_account.xml
res/layout/group_list.xml
res/layout/jingle_call_activity.xml
res/layout/login.xml
res/layout/login_anim.xml
res/layout/preferences.xml
res/layout/privacy_list.xml
res/layout/privacy_list_create_dialog.xml
res/layout/subscription.xml
res/layout/wizard_account.xml
res/layout/wizard_account_configure.xml
res/menu/chat.xml
res/menu/contact_list.xml
res/menu/contactlist_context.xml
res/menu/create_account.xml
res/menu/edit_settings.xml
res/menu/login.xml
res/menu/privacy_list.xml
res/menu/privacy_list_context.xml
res/values-de/strings.xml
res/values-es/strings.xml
res/values-fr/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values/arrays.xml
res/values/colors.xml
res/values/strings.xml
res/values/styles.xml
src/com/beem/project/beem/BeemApplication.java
src/com/beem/project/beem/BeemService.java
src/com/beem/project/beem/package-info.java
src/com/beem/project/beem/service/BeemCapsManager.java
src/com/beem/project/beem/service/BeemChatManager.java
src/com/beem/project/beem/service/ChatAdapter.java
src/com/beem/project/beem/service/Contact.aidl
src/com/beem/project/beem/service/Contact.java
src/com/beem/project/beem/service/LoginAsyncTask.java
src/com/beem/project/beem/service/Message.aidl
src/com/beem/project/beem/service/Message.java
src/com/beem/project/beem/service/PresenceAdapter.aidl
src/com/beem/project/beem/service/PresenceAdapter.java
src/com/beem/project/beem/service/PrivacyListItem.aidl
src/com/beem/project/beem/service/PrivacyListItem.java
src/com/beem/project/beem/service/PrivacyListManagerAdapter.java
src/com/beem/project/beem/service/RosterAdapter.java
src/com/beem/project/beem/service/XmppConnectionAdapter.java
src/com/beem/project/beem/service/XmppFacade.java
src/com/beem/project/beem/service/aidl/IBeemConnectionListener.aidl
src/com/beem/project/beem/service/aidl/IBeemRosterListener.aidl
src/com/beem/project/beem/service/aidl/IChat.aidl
src/com/beem/project/beem/service/aidl/IChatManager.aidl
src/com/beem/project/beem/service/aidl/IChatManagerListener.aidl
src/com/beem/project/beem/service/aidl/IContact.aidl
src/com/beem/project/beem/service/aidl/IMessageListener.aidl
src/com/beem/project/beem/service/aidl/IPrivacyListListener.aidl
src/com/beem/project/beem/service/aidl/IPrivacyListManager.aidl
src/com/beem/project/beem/service/aidl/IRoster.aidl
src/com/beem/project/beem/service/aidl/IXmppConnection.aidl
src/com/beem/project/beem/service/aidl/IXmppFacade.aidl
src/com/beem/project/beem/service/package-info.java
src/com/beem/project/beem/smack/caps/CapsExtension.java
src/com/beem/project/beem/smack/caps/CapsManager.java
src/com/beem/project/beem/smack/caps/CapsProvider.java
src/com/beem/project/beem/smack/caps/package-info.java
src/com/beem/project/beem/ui/AddContact.java
src/com/beem/project/beem/ui/ChangeStatus.java
src/com/beem/project/beem/ui/Chat.java
src/com/beem/project/beem/ui/ContactList.java
src/com/beem/project/beem/ui/CreateAccount.java
src/com/beem/project/beem/ui/GroupList.java
src/com/beem/project/beem/ui/Login.java
src/com/beem/project/beem/ui/LoginAnim.java
src/com/beem/project/beem/ui/PrivacyList.java
src/com/beem/project/beem/ui/Settings.java
src/com/beem/project/beem/ui/Subscription.java
src/com/beem/project/beem/ui/dialogs/builders/Alias.java
src/com/beem/project/beem/ui/dialogs/builders/ChatList.java
src/com/beem/project/beem/ui/dialogs/builders/CreatePrivacyList.java
src/com/beem/project/beem/ui/dialogs/builders/DeleteContact.java
src/com/beem/project/beem/ui/dialogs/builders/DeletePrivacyList.java
src/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java
src/com/beem/project/beem/ui/dialogs/builders/package-info.java
src/com/beem/project/beem/ui/package-info.java
src/com/beem/project/beem/ui/wizard/Account.java
src/com/beem/project/beem/ui/wizard/AccountConfigure.java
src/com/beem/project/beem/ui/wizard/package-info.java
src/com/beem/project/beem/utils/BeemBroadcastReceiver.java
src/com/beem/project/beem/utils/BeemConnectivity.java
src/com/beem/project/beem/utils/FreePort.java
src/com/beem/project/beem/utils/PresenceType.java
src/com/beem/project/beem/utils/SortedList.java
src/com/beem/project/beem/utils/Status.java
src/com/beem/project/beem/utils/package-info.java
tools/JavaHeaderCheck.regex
tools/LicenseHeader.txt
tools/README
tools/checkstyle.xml
tools/eclipse_formatter.xml