0000000000000000000000000000000000000000 6e4cacc787fdb7c30061a086d58febad6c9e21f3 Marco Barisione <marco@barisione.org> 1266339010 +0000	commit (initial): Initial stubs
6e4cacc787fdb7c30061a086d58febad6c9e21f3 c0cf20c444efe8576246a7d567ca1c7c790c9bab Marco Barisione <marco@barisione.org> 1266339210 +0000	commit (amend): Initial stubs
c0cf20c444efe8576246a7d567ca1c7c790c9bab 92b20dd141afc7b233ae223a405d010131696924 Marco Barisione <marco@barisione.org> 1266339308 +0000	commit (amend): Initial stubs
92b20dd141afc7b233ae223a405d010131696924 e4879f000cf50e60198c78d2282f156984070212 Marco Barisione <marco@barisione.org> 1266339382 +0000	commit (amend): Initial stubs
e4879f000cf50e60198c78d2282f156984070212 8e4c713d0b5a1c82d3cab434f8b8ff5a298ed9b3 Marco Barisione <marco@barisione.org> 1266339453 +0000	commit (amend): Initial stubs
8e4c713d0b5a1c82d3cab434f8b8ff5a298ed9b3 18d75e7d5e0c811130502d4d9c52bff23418f37b Marco Barisione <marco@barisione.org> 1266346570 +0000	commit: Add a stub for detecting keys for duplicate detection
18d75e7d5e0c811130502d4d9c52bff23418f37b bf5b36421f9b87a23ec9d29b3996eb0ca4655895 Marco Barisione <marco@barisione.org> 1266347303 +0000	commit: Split debugging and merging stuff in separate files
bf5b36421f9b87a23ec9d29b3996eb0ca4655895 b74be633c83eb0f0422ab57b7f8dbd1f2150d98b Marco Barisione <marco@barisione.org> 1266418466 +0000	commit: Store the contacts' components that could lead to a match
b74be633c83eb0f0422ab57b7f8dbd1f2150d98b ae1e390a1f3ce3c5650e0bbf854ca60e5504603c Marco Barisione <marco@barisione.org> 1266418587 +0000	commit: Add some comments to split sections in the merger.c file
ae1e390a1f3ce3c5650e0bbf854ca60e5504603c 0eb815e0aba676b5506cd93899c5a0003860f73e Marco Barisione <marco@barisione.org> 1266423755 +0000	commit: Don't use g_vprintf() for debugging
0eb815e0aba676b5506cd93899c5a0003860f73e 5737cbc924756759d9e85bb217679ab1fa972436 Marco Barisione <marco@barisione.org> 1266423888 +0000	commit: Don't include the function name in the debug output
5737cbc924756759d9e85bb217679ab1fa972436 37a76ef1f4555d02c9568da59336c62db2be268a Marco Barisione <marco@barisione.org> 1266424062 +0000	commit: Improve the readability of debug messages
37a76ef1f4555d02c9568da59336c62db2be268a 516ac6ee07fc65fb9b9da78a5862892faa89c650 Marco Barisione <marco@barisione.org> 1266424915 +0000	commit: Add support for NICKNAME
516ac6ee07fc65fb9b9da78a5862892faa89c650 6011eebc80c80d5c7e7d5a06a0ce5456f0c5d6ab Marco Barisione <marco@barisione.org> 1266437331 +0000	commit: Detect the matches
6011eebc80c80d5c7e7d5a06a0ce5456f0c5d6ab 35f98259202a71638dbe539db9ef896430661492 Marco Barisione <marco@barisione.org> 1266437476 +0000	commit (amend): Detect the matches
35f98259202a71638dbe539db9ef896430661492 3b4b0f5d3394abfbbce38f357f9bffad55609310 Marco Barisione <marco@barisione.org> 1266437499 +0000	commit: Add a bunch of missing statics
3b4b0f5d3394abfbbce38f357f9bffad55609310 0a21464e938ec86d2f7fdf9a6b9d3f04c6a79691 Marco Barisione <marco@barisione.org> 1266437526 +0000	commit: Pass "-Wall foreign" to AM_INIT_AUTOMAKE
0a21464e938ec86d2f7fdf9a6b9d3f04c6a79691 83ae1a0bd146846418737255a5458791f0650a81 Marco Barisione <marco@barisione.org> 1266437617 +0000	commit: Fix a memleak
83ae1a0bd146846418737255a5458791f0650a81 dbc3f517ce79a5dd90572383bac48b1e8bdcb2cb Marco Barisione <marco@barisione.org> 1266439715 +0000	commit: Add a description of why the match happened
dbc3f517ce79a5dd90572383bac48b1e8bdcb2cb 0793e3017ddf034d3509adce65cbf16398a401b9 Marco Barisione <marco@barisione.org> 1266493343 +0000	commit: Ops, don't use as ID the field name, but the actual ID
0793e3017ddf034d3509adce65cbf16398a401b9 6bfd5cbc8ef3076733be5a72f376a72b5ff3f23b Marco Barisione <marco@barisione.org> 1266494595 +0000	commit: Match the local part of IDs too
6bfd5cbc8ef3076733be5a72f376a72b5ff3f23b 24362d99362776b1db5135b047a35c77c46b10fd Marco Barisione <marco@barisione.org> 1266495477 +0000	commit: Parse the local part of IDs as names
24362d99362776b1db5135b047a35c77c46b10fd 203e53709a0e092a4b8920d0a71940f3f7dfcf0b Marco Barisione <marco@barisione.org> 1266501262 +0000	commit: Pass the list of IM fields to generate_merge_suggestions()
203e53709a0e092a4b8920d0a71940f3f7dfcf0b c78d574e90a6339dd2c6e360e71118b99c2ac73c Marco Barisione <marco@barisione.org> 1266503840 +0000	commit: Consider IM names for the suggestions generation
c78d574e90a6339dd2c6e360e71118b99c2ac73c 75b7e1aeef847d81e4b7af074a0836c1e370650f Marco Barisione <marco@barisione.org> 1266527539 +0000	commit: XXX
75b7e1aeef847d81e4b7af074a0836c1e370650f 203e53709a0e092a4b8920d0a71940f3f7dfcf0b Marco Barisione <marco@barisione.org> 1266527564 +0000	checkout: moving from master to 203e537
203e53709a0e092a4b8920d0a71940f3f7dfcf0b 24362d99362776b1db5135b047a35c77c46b10fd Marco Barisione <marco@barisione.org> 1266527565 +0000	rebase -i (squash): updating HEAD
24362d99362776b1db5135b047a35c77c46b10fd cb4b6a202dac4be35cc4a9803f5a784cb92b70f8 Marco Barisione <marco@barisione.org> 1266527565 +0000	commit: Pass the list of IM fields to generate_merge_suggestions()
cb4b6a202dac4be35cc4a9803f5a784cb92b70f8 b61918bca2c3b031d390c6b9595797da85a97659 Marco Barisione <marco@barisione.org> 1266527572 +0000	commit: Consider IM names for the suggestions generation
b61918bca2c3b031d390c6b9595797da85a97659 1fdac20a5f26c02eb307e209215d3b78fb37ff09 Marco Barisione <marco@barisione.org> 1266532748 +0000	commit: Add string_simplify() to strip accents
1fdac20a5f26c02eb307e209215d3b78fb37ff09 cfc3984e02ff7e28ded03b24dc6818ed25446acc Marco Barisione <marco@barisione.org> 1266575701 +0000	commit: Ignore case, accents and other marks when matching contacts
cfc3984e02ff7e28ded03b24dc6818ed25446acc 19d59ff50afff667d5c7e3a0d8cee63ff24d112c Marco Barisione <marco@barisione.org> 1266582103 +0000	commit: Include in the description whether the match was partial
19d59ff50afff667d5c7e3a0d8cee63ff24d112c b2c56bbcc7312f214f705799e43be8a5ce1428d1 Marco Barisione <marco@barisione.org> 1266582767 +0000	commit: Add phone matching
b2c56bbcc7312f214f705799e43be8a5ce1428d1 aa5720e545d4fbf44a719a0c653965b0f7081cf8 Marco Barisione <marco@barisione.org> 1266584981 +0000	commit: Make the phone matching fuzzy
aa5720e545d4fbf44a719a0c653965b0f7081cf8 ea58355feecfd60903d489ceead2e70a86861d4b Marco Barisione <marco@barisione.org> 1266585136 +0000	commit: The suggestion generation for partial IDs was done with the wrong table
ea58355feecfd60903d489ceead2e70a86861d4b 1b480f932e0182f5bf637ca7559f0eee9a562d64 Marco Barisione <marco@barisione.org> 1266585267 +0000	commit: Rename some arguments for clarity
1b480f932e0182f5bf637ca7559f0eee9a562d64 a8f77c21c0fb4ccbd212494f96a8bb51be02b74f Marco Barisione <marco@barisione.org> 1266585327 +0000	commit: Remove some unused arguments
a8f77c21c0fb4ccbd212494f96a8bb51be02b74f a41f53766060807840b3369d37103fda479b70c8 Marco Barisione <marco@barisione.org> 1266591077 +0000	commit (amend): Remove some unused arguments
a41f53766060807840b3369d37103fda479b70c8 38262cf5b78e06170210689a48cad5db2b3e673a Marco Barisione <marco@barisione.org> 1266591086 +0000	commit: Fix a wrong class name in a commnet
38262cf5b78e06170210689a48cad5db2b3e673a db3a2b6d3ceeae7b4385c97c7139a4deec5b37d9 Marco Barisione <marco@barisione.org> 1266603501 +0000	commit: Disable the use of partial names for now
db3a2b6d3ceeae7b4385c97c7139a4deec5b37d9 bc02b575d4eb06b5c7934596fdd3dccfa021a0ab Marco Barisione <marco@barisione.org> 1266603915 +0000	commit: The ordering of the descriptions was random due to a typo
bc02b575d4eb06b5c7934596fdd3dccfa021a0ab 899afd13790fe463d92444a4e3967331b442357f Marco Barisione <marco@barisione.org> 1266605459 +0000	commit: Consider middle names too
899afd13790fe463d92444a4e3967331b442357f 9ffa1fd4334ce034d1c541c7f2b949b6836a5a9f Marco Barisione <marco@barisione.org> 1266837540 +0000	commit: Get rid of the code for partial names
9ffa1fd4334ce034d1c541c7f2b949b6836a5a9f 8e4b807ef6d753f72055959c50665c2fb1049970 Marco Barisione <marco@barisione.org> 1266840211 +0000	commit: Refactor a bit inster_generic_name()
8e4b807ef6d753f72055959c50665c2fb1049970 e0178d65d23acc488e6eade8cbffc80e7c832588 Marco Barisione <marco@barisione.org> 1266841596 +0000	commit: Consider unparsed nicknames
e0178d65d23acc488e6eade8cbffc80e7c832588 5f0e4c4ef072c4b560a437862d6ea27bf1b08bcb Marco Barisione <marco@barisione.org> 1266843236 +0000	commit: Make the functions to handle matches public
5f0e4c4ef072c4b560a437862d6ea27bf1b08bcb 2269ee15fb0cec8661f3a554d43e6487e1fb41d5 Marco Barisione <marco@barisione.org> 1266843394 +0000	commit (amend): Make the functions to handle matches public
2269ee15fb0cec8661f3a554d43e6487e1fb41d5 bd8cf017c2987c138d2e4ff0079d2467d2781083 Marco Barisione <marco@barisione.org> 1267463530 +0000	commit: Add get_avatar() to get a rounder and resized avatar for display
bd8cf017c2987c138d2e4ff0079d2467d2781083 53ee287bf6ebb750d77d25b90f002bd51b6d3791 Marco Barisione <marco@barisione.org> 1267463583 +0000	commit: Make Match and the Match list boxed types
53ee287bf6ebb750d77d25b90f002bd51b6d3791 f3fbeab8583c21b6819cda2405386cbe56a33219 Marco Barisione <marco@barisione.org> 1267463695 +0000	commit: Add MatchCellRenderer
f3fbeab8583c21b6819cda2405386cbe56a33219 9d676cf2a37a57fa1ecd054a9897067c0e0e45b0 Marco Barisione <marco@barisione.org> 1267463839 +0000	commit: Add MergerWindow
9d676cf2a37a57fa1ecd054a9897067c0e0e45b0 86946522eed6716d40281fe3ea008bd6a70fcce6 Marco Barisione <marco@barisione.org> 1267463973 +0000	commit: Use MergerWindow to show the matches
86946522eed6716d40281fe3ea008bd6a70fcce6 a1dfbfd81858288ed5cc67c804c22f4cbe9a710a Marco Barisione <marco@barisione.org> 1267464401 +0000	commit: Add various configure flags
a1dfbfd81858288ed5cc67c804c22f4cbe9a710a 7d82b0831e01ca3476570b21d6c697cde40acfa5 Marco Barisione <marco@barisione.org> 1267464579 +0000	commit: Set the log domain
7d82b0831e01ca3476570b21d6c697cde40acfa5 863fe3c02702660f4a1e3ee4ddaf8164016e13a8 Marco Barisione <marco@barisione.org> 1267464602 +0000	commit: Use the error-related CFLAGS
863fe3c02702660f4a1e3ee4ddaf8164016e13a8 af74ac384b3a4515bce21cb5d3209363d13c3312 Marco Barisione <marco@barisione.org> 1267465177 +0000	commit: Add some extra warnings
af74ac384b3a4515bce21cb5d3209363d13c3312 3f3d0fba5792094cf418f3ffb33596efb9c32541 Marco Barisione <marco@barisione.org> 1267465256 +0000	commit: Fix some warnings
3f3d0fba5792094cf418f3ffb33596efb9c32541 297e8c2bf255b8bd614e3d84de96370834bff8ac Marco Barisione <marco@barisione.org> 1267465578 +0000	commit: Free the match list when disposing MergerWindow
297e8c2bf255b8bd614e3d84de96370834bff8ac 24ecfb86e83d3ba9d411519b6754b00cbc21008e Marco Barisione <marco@barisione.org> 1267465928 +0000	commit: Remove an unused account manager
24ecfb86e83d3ba9d411519b6754b00cbc21008e 461c6d80e6baf0a5f23e4829f5871493d07b7350 Marco Barisione <marco@barisione.org> 1267468275 +0000	commit: Pass the contacts to merge to the merge function stub
461c6d80e6baf0a5f23e4829f5871493d07b7350 bc36812853133efa663756836d0b0c307a5bd21b Marco Barisione <marco@barisione.org> 1267474072 +0000	commit: Prepare the list of contacts to merge from the pairs of contacts
bc36812853133efa663756836d0b0c307a5bd21b afb817590841e06fd791a8998769a4b4b9b1630c Marco Barisione <marco@barisione.org> 1267627298 +0000	commit: Actually merge and commit the contacts
afb817590841e06fd791a8998769a4b4b9b1630c 78ababc0bf1bba84d7a23c88e9859dbafad394cd Marco Barisione <marco@barisione.org> 1267641627 +0000	commit: Show a dialog when the merge is finished
78ababc0bf1bba84d7a23c88e9859dbafad394cd 512cd871a34f511ab424e67f11ad2d9d5a66d842 Marco Barisione <marco@barisione.org> 1267642238 +0000	am: Avoid casting from GdkRectangle to PangoRectangle
512cd871a34f511ab424e67f11ad2d9d5a66d842 2b1049fd3ec0a677274670a35e55d22fd3820c50 Marco Barisione <marco@barisione.org> 1267711433 +0000	commit: Show the list of unmerged contacts when "Error details" is clicked
2b1049fd3ec0a677274670a35e55d22fd3820c50 8be7d1c0929cc87e8aeb4347c00800518df5e0f1 Marco Barisione <marco@barisione.org> 1267711646 +0000	commit: Keep a pointer to the summary dialog in MergerWindowPrivate
8be7d1c0929cc87e8aeb4347c00800518df5e0f1 256c5a0348c3fc810f94a3756f45523137c60a63 Marco Barisione <marco@barisione.org> 1267711945 +0000	commit: Show again the summary dialog when the error dialog is closed
256c5a0348c3fc810f94a3756f45523137c60a63 891f968ad2cbdfb90d52e734cf858ea455917b7d Marco Barisione <marco@barisione.org> 1267712089 +0000	commit: Set the title for the error details dialog
891f968ad2cbdfb90d52e734cf858ea455917b7d 7ee06976660ebf1b5f0685134eeff2e7e0e9c769 Marco Barisione <marco@barisione.org> 1267712162 +0000	commit: Move stuff from finalize to dispose
7ee06976660ebf1b5f0685134eeff2e7e0e9c769 797d89d3012d97dd6c22a9bb20866f9d1e7ab769 Marco Barisione <marco@barisione.org> 1267712204 +0000	commit: Make sure the stuff we free in dispose is set to NULL
797d89d3012d97dd6c22a9bb20866f9d1e7ab769 797d89d3012d97dd6c22a9bb20866f9d1e7ab769 Marco Barisione <marco@barisione.org> 1267796415 +0000	checkout: moving from master to welcome-test
797d89d3012d97dd6c22a9bb20866f9d1e7ab769 f3358754455598996b96524527aa497c8e5a13c8 Marco Barisione <marco@barisione.org> 1267796417 +0000	commit: Some experiments with a welcome screen
f3358754455598996b96524527aa497c8e5a13c8 797d89d3012d97dd6c22a9bb20866f9d1e7ab769 Marco Barisione <marco@barisione.org> 1267796432 +0000	checkout: moving from welcome-test to master
797d89d3012d97dd6c22a9bb20866f9d1e7ab769 6f9e3935e0c96e61559da3358d95d362bc2dbd64 Marco Barisione <marco@barisione.org> 1267798919 +0000	commit: Move the setup of the aggregator to MergerWindow
6f9e3935e0c96e61559da3358d95d362bc2dbd64 3c264939ec16da4df8f7194765d51e61d43b4371 Marco Barisione <marco@barisione.org> 1267799153 +0000	commit: Display the progress indicator while loading the matches
3c264939ec16da4df8f7194765d51e61d43b4371 8a44c4f15fa196a1a32d38f1c2cd1ae9fe066f53 Marco Barisione <marco@barisione.org> 1267799413 +0000	commit: Show a banner if the "Merge" button is pressed an no contact is selected
8a44c4f15fa196a1a32d38f1c2cd1ae9fe066f53 7297d0b0b0797b7dbfbfa0a9b02ab66581e7a561 Marco Barisione <marco@barisione.org> 1267800681 +0000	commit: Show an explanation dialogs if there are matches
7297d0b0b0797b7dbfbfa0a9b02ab66581e7a561 47ebba54d3682b489398938585a7140cb5429f65 Marco Barisione <marco@barisione.org> 1267801742 +0000	commit: Show "(No duplicate contacts found)" if no matches are found
47ebba54d3682b489398938585a7140cb5429f65 f499f8c623830ab977fc505a9b82f63266f615e1 Marco Barisione <marco@barisione.org> 1267802234 +0000	commit (amend): Show "(No duplicate contacts found)" if no matches are found
f499f8c623830ab977fc505a9b82f63266f615e1 fb360b903d7a741fdf3d30784dbde2bf25b87f0c Marco Barisione <marco@barisione.org> 1267802285 +0000	commit (amend): Show "(No duplicate contacts found)" if no matches are found
fb360b903d7a741fdf3d30784dbde2bf25b87f0c f025dce17bd69af752747049182ba852e3bacb6c Marco Barisione <marco@barisione.org> 1267810076 +0000	commit: Move the logic to quit the application to main.c
f025dce17bd69af752747049182ba852e3bacb6c 9002d940e53155c3dc649fa95e469c107cc9d90a Marco Barisione <marco@barisione.org> 1267810114 +0000	commit: Drop the parenthesis around "No duplicate contacts found"
9002d940e53155c3dc649fa95e469c107cc9d90a 8084ae181970483e39b4e9fb11b6b3b8bd2d30c4 Marco Barisione <marco@barisione.org> 1267810354 +0000	commit: Handle error conditions better
8084ae181970483e39b4e9fb11b6b3b8bd2d30c4 aa2ff2aaf90e26c513185d4cd64b27c829a2d245 Marco Barisione <marco@barisione.org> 1274458902 +0100	commit: Disable -Werror for package builds
aa2ff2aaf90e26c513185d4cd64b27c829a2d245 fe38b71872983b8fdff1934589a25d75d9a3ad81 Marco Barisione <marco@barisione.org> 1274459373 +0100	commit: Use a proper category for the debian packages
fe38b71872983b8fdff1934589a25d75d9a3ad81 bccbedaa526dfafc33b71b0f4673f685e246f57b Marco Barisione <marco@barisione.org> 1274460692 +0100	commit: Commit one contact at a time to avoid merge dialogs on top of each other
bccbedaa526dfafc33b71b0f4673f685e246f57b 295e1f7c8a5a4e5ecdeaa0891d972cf2da967ef9 Marco Barisione <marco@barisione.org> 1274462054 +0100	commit: Ops, it's contacts-merge*r* not contacts-merge
295e1f7c8a5a4e5ecdeaa0891d972cf2da967ef9 40c8ff0fb6b656d33b655646ac29aa5fabd140bc Marco Barisione <marco@barisione.org> 1274462769 +0100	commit (amend): Ops, it's contacts-merge*r* not contacts-merge
40c8ff0fb6b656d33b655646ac29aa5fabd140bc 950f82b5f2aa7151413ab5a932321161b3f38084 Marco Barisione <marco@barisione.org> 1274806864 +0100	commit (amend): Ops, it's contacts-merge*r* not contacts-merge
950f82b5f2aa7151413ab5a932321161b3f38084 50d9f5049683db8eac1d773eff9d25d4b82f7fc0 Marco Barisione <marco@barisione.org> 1274806951 +0100	commit: Improve the package description
50d9f5049683db8eac1d773eff9d25d4b82f7fc0 615fdea8eedc508e79406b92f073076ccd01e298 Marco Barisione <marco@barisione.org> 1274810898 +0100	commit: Add the stub for an address book plugin
615fdea8eedc508e79406b92f073076ccd01e298 7276a0bd773e36505d64410ba813296a149b96e6 Marco Barisione <marco@barisione.org> 1274810936 +0100	commit: XXX
7276a0bd773e36505d64410ba813296a149b96e6 777e4571e029516e15ef4b49d2f25601f58d6dcc Marco Barisione <marco@barisione.org> 1274810977 +0100	commit: YYY
777e4571e029516e15ef4b49d2f25601f58d6dcc 950f82b5f2aa7151413ab5a932321161b3f38084 Marco Barisione <marco@barisione.org> 1274811113 +0100	checkout: moving from master to 950f82b
950f82b5f2aa7151413ab5a932321161b3f38084 bccbedaa526dfafc33b71b0f4673f685e246f57b Marco Barisione <marco@barisione.org> 1274811113 +0100	rebase -i (squash): updating HEAD
bccbedaa526dfafc33b71b0f4673f685e246f57b ec441cdf3f98003d3eea19dcc8b60ee43d7ba193 Marco Barisione <marco@barisione.org> 1274811113 +0100	commit: Ops, it's contacts-merge*r* not contacts-merge
ec441cdf3f98003d3eea19dcc8b60ee43d7ba193 e71972c69680fcdc6f8b140179b01004ae5d9b24 Marco Barisione <marco@barisione.org> 1274811118 +0100	commit: Improve the package description
e71972c69680fcdc6f8b140179b01004ae5d9b24 ebd50ac46d203d23afc1d6678616350f15b4d98f Marco Barisione <marco@barisione.org> 1274811119 +0100	commit: Add the stub for an address book plugin
ebd50ac46d203d23afc1d6678616350f15b4d98f e71972c69680fcdc6f8b140179b01004ae5d9b24 Marco Barisione <marco@barisione.org> 1274811119 +0100	rebase -i (squash): updating HEAD
e71972c69680fcdc6f8b140179b01004ae5d9b24 eb4444b69e0a699701d9362179174617df3fcc63 Marco Barisione <marco@barisione.org> 1274811119 +0100	commit: Add the stub for an address book extension
eb4444b69e0a699701d9362179174617df3fcc63 eb4444b69e0a699701d9362179174617df3fcc63 Marco Barisione <marco@barisione.org> 1274884947 +0100	checkout: moving from master to foreign-window-test
eb4444b69e0a699701d9362179174617df3fcc63 d6851d8641320f24c6ae738c5e1919340959f5eb Marco Barisione <marco@barisione.org> 1274884949 +0100	commit: Foreign window test
d6851d8641320f24c6ae738c5e1919340959f5eb eb4444b69e0a699701d9362179174617df3fcc63 Marco Barisione <marco@barisione.org> 1274884960 +0100	checkout: moving from foreign-window-test to master
eb4444b69e0a699701d9362179174617df3fcc63 bce40ffb08a617740e139d9c1aab60ee41fd7360 Marco Barisione <marco@barisione.org> 1274890519 +0100	commit: Move all the merging and UI code to a convenience library
bce40ffb08a617740e139d9c1aab60ee41fd7360 313977c0f341e1fc1ff81b72bd17a0e159cc66fd Marco Barisione <marco@barisione.org> 1274891267 +0100	commit: Make the merger window a hildon stackable window
313977c0f341e1fc1ff81b72bd17a0e159cc66fd 0e4cace660060852b48c207227a1225e37cc74fe Marco Barisione <marco@barisione.org> 1274891886 +0100	commit: Make the plugin display the merger when the button is clicked
0e4cace660060852b48c207227a1225e37cc74fe 5b35ae8b073d56466eeff5552934227b54e8dfa1 Marco Barisione <marco@barisione.org> 1274891917 +0100	commit: Load the dups in an idle to avoid blocking the UI
5b35ae8b073d56466eeff5552934227b54e8dfa1 d27fb19f012c1cbb6cc3d313cc378bd9cda44642 Marco Barisione <marco@barisione.org> 1274891944 +0100	commit: XXX
d27fb19f012c1cbb6cc3d313cc378bd9cda44642 313977c0f341e1fc1ff81b72bd17a0e159cc66fd Marco Barisione <marco@barisione.org> 1274892066 +0100	checkout: moving from master to 313977c
313977c0f341e1fc1ff81b72bd17a0e159cc66fd bce40ffb08a617740e139d9c1aab60ee41fd7360 Marco Barisione <marco@barisione.org> 1274892066 +0100	rebase -i (squash): updating HEAD
bce40ffb08a617740e139d9c1aab60ee41fd7360 6d351c65a859582e33dc73ae3294e7898f412735 Marco Barisione <marco@barisione.org> 1274892066 +0100	commit: Make the merger window a hildon stackable window
6d351c65a859582e33dc73ae3294e7898f412735 aca00a141118144404c19498e828cb47b2679358 Marco Barisione <marco@barisione.org> 1274892072 +0100	commit: Make the plugin display the merger when the button is clicked
aca00a141118144404c19498e828cb47b2679358 805e3c9b0639c2d122bc6b2c34690369e0ce3673 Marco Barisione <marco@barisione.org> 1274892072 +0100	commit: Load the dups in an idle to avoid blocking the UI
805e3c9b0639c2d122bc6b2c34690369e0ce3673 b7d1b1565243575b4147c9766f5e85100ec418ec Marco Barisione <marco@barisione.org> 1274896270 +0100	commit: Use a HildonNote instead of a HildonBanner when the merge is successful
b7d1b1565243575b4147c9766f5e85100ec418ec 06bd2e748939977ccd46572be2a3e0520fe5c2c3 Marco Barisione <marco@barisione.org> 1274957567 +0100	commit: Make contact_pair_equal() look nicer
06bd2e748939977ccd46572be2a3e0520fe5c2c3 10cdf6f202e5359f0b56192de7879925b58b1c10 Marco Barisione <marco@barisione.org> 1275404741 +0100	commit: Make match_get_contacts() accept null contact pointers
10cdf6f202e5359f0b56192de7879925b58b1c10 d0d3d5054f0fa5f7fd0c9531b956865fdb56ba4f Marco Barisione <marco@barisione.org> 1275405735 +0100	commit: Show the contacts' details when long tapping on a row
d0d3d5054f0fa5f7fd0c9531b956865fdb56ba4f 24d1a55e7efa90931ae26927c52670932de5e313 Marco Barisione <marco@barisione.org> 1275406826 +0100	commit: Make it possible to disable debug messages
24d1a55e7efa90931ae26927c52670932de5e313 ed546ca948cba320e30fc15a9e0875801b0e435c Marco Barisione <marco@barisione.org> 1275406998 +0100	commit: Don't do expensive debugging operations if debugging is disabled
ed546ca948cba320e30fc15a9e0875801b0e435c a819559980288f56281c428aa049f28dcf9acc6d Marco Barisione <marco@barisione.org> 1275407422 +0100	commit: Don't show the score in the UI if debugging is disabled
a819559980288f56281c428aa049f28dcf9acc6d ee0809a1b092332aff3316d0ff200992345d7692 Marco Barisione <marco@barisione.org> 1275408098 +0100	commit: Disable the live search bar
ee0809a1b092332aff3316d0ff200992345d7692 88bb915a0270ec556e5965e41b9dbbec2f4df755 Marco Barisione <marco@barisione.org> 1275409952 +0100	commit: Add icon, display name and bug tracker info
88bb915a0270ec556e5965e41b9dbbec2f4df755 ebbd62635e86dd7472b76e217ac3a162e58c651c Marco Barisione <marco@barisione.org> 1275503397 +0100	commit: Work around non re-entrant D-Bus callbacks
ebbd62635e86dd7472b76e217ac3a162e58c651c 76582e867befc8a8982e25e08ae179f98de21573 Marco Barisione <marco@barisione.org> 1275561199 +0100	commit: Fix a wrong strings ("nicknames" -> "nickname")
76582e867befc8a8982e25e08ae179f98de21573 9f86f58970c67fa2adf54e746e72a7f7e94182b6 Marco Barisione <marco@barisione.org> 1275562299 +0100	commit: "Matches:" instead of "Match of:"
9f86f58970c67fa2adf54e746e72a7f7e94182b6 24dcb0e7f351d3a155181ca182e70972240bbcca Marco Barisione <marco@barisione.org> 1275563507 +0100	commit: Show better strings in the popup menu
24dcb0e7f351d3a155181ca182e70972240bbcca b229e3c8ab234b7d138e382d3ed9386e51c53e93 Marco Barisione <marco@barisione.org> 1275573493 +0100	commit: Put the explanation directly in the main window
b229e3c8ab234b7d138e382d3ed9386e51c53e93 df5e794c9a93db8137c78ef9b4a9702a03b93744 Marco Barisione <marco@barisione.org> 1275573710 +0100	commit: Show the progress indicator while merging
df5e794c9a93db8137c78ef9b4a9702a03b93744 933755fbc03496bbd848c3ecfd2c03c8022da58b Marco Barisione <marco@barisione.org> 1275591264 +0200	commit: Ellipsize names and descriptions if they are too long
933755fbc03496bbd848c3ecfd2c03c8022da58b 0a0503e9363c011612def4236d950b1f1a6a0d1d Marco Barisione <marco@barisione.org> 1275594175 +0200	commit: Improve a string
0a0503e9363c011612def4236d950b1f1a6a0d1d bcca4d50d9af75de5468882da8d2f41ba14cdde7 Marco Barisione <marco@barisione.org> 1275594453 +0200	commit: Put something in the README file
bcca4d50d9af75de5468882da8d2f41ba14cdde7 5b9934f63c76faae233a2faf0c4ccf55e612a2e8 Marco Barisione <marco@barisione.org> 1275594526 +0200	commit: Release 0.1
