]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 051bee9 1301877)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Fri, 19 Mar 2010 00:11:06 +0000 (17:11 -0700)
committerZach Copley <zach@status.net>
Fri, 19 Mar 2010 00:11:06 +0000 (17:11 -0700)
commita6c9445f0de1a74ffc81dda12eaba6ee36410716
tree873d6a67626ef324c0102153c6a027291767b878tree | snapshot
parent051bee988caa4a8d3648fae9f963cb35d26c13c5commit | diff
parent1301877dfe89c57c182246c0d7ba0ff6335fd17bcommit | diff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  OStatus discover fixes:
  Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
  Fix notice warning about unused var -- was renamed during refactoring.
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)