summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* closing old/merged branchesirc-len-fixGary Kramlich2016-10-050-0/+0
* Fix issue #4753 with IRC message truncationSenya2016-08-202-3/+21
* Merged in rw_grim/pidgin (pull request #97)Gary Kramlich2016-08-20176-270399/+93456
|\
| * Cleanup some bonjour stuffGary Kramlich2016-08-201-7/+2
| * ignore a "build" directoryGary Kramlich2016-08-201-0/+1
| * Bring this up to date with defaultGary Kramlich2016-08-201-1/+0
| |\
| * | Merge fixupGary Kramlich2016-08-201-1/+1
| * | Fixups for mxitGary Kramlich2016-08-192-21/+2
| * | Fix prefs for stuff that was broken in the mergeGary Kramlich2016-08-192-0/+117
| * | Fix up the commands execute stuffGary Kramlich2016-08-192-14/+45
| * | Remove a hunk that shouldn't have been mergedGary Kramlich2016-08-191-5/+0
| * | Monster merge everythingGary Kramlich2016-08-19180-270376/+93313
| |\ \
| | * | Update the ChangeLog for the certificate updatesv2.11.0Gary Kramlich2016-06-191-0/+3
| | * | Pull in the last changes from the public repoGary Kramlich2016-06-193-7/+11
| | |\ \
| | | * \ Merge in the oscar string updatesGary Kramlich2016-06-191-5/+5
| | | |\ \
| | | | * | Cleanup AIM/ICQ authentication descriptionsRichard Laager2016-06-191-5/+5
| | | * | | remove devel from the version for releaseGary Kramlich2016-06-181-2/+2
| | | |/ /
| | | * | media: Fix gstreamer 0.10 compat (gst_registry_get() is missing there)dx2016-06-191-0/+4
| | * | | Merge the last pr from the public treeGary Kramlich2016-06-183-4/+50
| | |\ \ \ | | | |/ /
| | | * | Merged in xhaakon/pidgin/release-2.x.y (pull request #81)Gary Kramlich2016-06-183-4/+50
| | | |\ \
| | | | * | mediamanager: fix invalid access to freed PurpleMediaAppDataInfoJakub Adam2016-06-101-2/+31
| | | | * | mediamanager: fix invalid memory readJakub Adam2016-06-101-1/+5
| | | | * | media: don't let Farstream use VA-API elementsJakub Adam2016-05-161-0/+11
| | | | * | gtkxfer: add 'file://' scheme to purple_notify_uri() argumentJakub Adam2016-06-171-1/+3
| | * | | | Merge the removed release prep ca-certs stuffGary Kramlich2016-06-181-14/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | ca-certs: Temporarily remove release prep targetsdx2016-06-181-14/+0
| | * | | | Merge the dist-clean fixesGary Kramlich2016-06-1816-350/+534
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge in the public updatesGary Kramlich2016-06-1816-350/+534
| | | |\ \ \
| | | | * \ \ Merged public changes inGary Kramlich2016-06-1216-350/+534
| | | | |\ \ \
| | | | | * \ \ Merged TALOS-CAN-0143Gary Kramlich2016-06-122-0/+21
| | | | | |\ \ \
| | | | | | * | | ChangeLog the fix for TALOS-CAN-0143Gary Kramlich2016-06-031-0/+4
| | | | | | * | | Fix for TALOS-CAN-0143Andrew Victor2016-06-031-0/+19
| | | | | * | | | Merged TALOS-CAN-0139Gary Kramlich2016-06-122-0/+8
| | | | | |\ \ \ \
| | | | | | * | | | ChangeLog the fix for TALOS-CAN-0139Gary Kramlich2016-06-031-0/+4
| | | | | | * | | | Fix TALOS-CAN-0139Andrew Victor2016-06-031-0/+6
| | | | | | |/ / /
| | | | | * | | | Merged TALOS-CAN-0141Gary Kramlich2016-06-1215-344/+481
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merged TALOS-CAN-0142Gary Kramlich2016-06-122-1/+3
| | | | | | |\ \ \ \
| | | | | | | * | | | ChangeLog the fix for TALOS-CAN-0142Gary Kramlich2016-06-021-0/+4
| | | | | | | * | | | Fix for TALOS-CAN-0142Andrew Victor2016-06-021-1/+1
| | | | | | | |/ / /
| | | | | | * | | | Merged TALOS-CAN-0137Gary Kramlich2016-06-1214-342/+474
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merged TALOS-CAN-0136Gary Kramlich2016-06-1213-284/+384
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ Merged TALOS-CAN-0134Gary Kramlich2016-06-1213-282/+372
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ Merged TALOS-CAN-0133Gary Kramlich2016-06-122-6/+17
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | ChangeLog the TALOS-CAN-0133 fixGary Kramlich2016-06-021-1/+6
| | | | | | | | | | * | | | Fix TALOS-CAN-0133Andrew Victor2016-06-021-6/+14
| | | | | | | | | | |/ / /
| | | | | | | | | * | | | Merged TALOS-CAN-0128Gary Kramlich2016-06-122-2/+4
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | ChangeLog the TALOS-CAN-128 fixGary Kramlich2016-06-021-0/+4
| | | | | | | | | | * | | | Fix TALOS-CAN-0128Andrew Victor2016-06-021-2/+2
| | | | | | | | | | |/ / /
| | | | | | | | | * | | | Merged TALOS-CAN-0123Gary Kramlich2016-06-1211-267/+337
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * \ \ \ Merge TALOS-CAN-0119Gary Kramlich2016-06-1210-264/+332
| | | | | | | | | | |\ \ \ \