?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 2428951) | patch
Merging [19298] from 1.0 branch.tags/AdiumX_1.0.2v1.0.2
commit8eb8f904883211429291664525832bb62feeda0a
authorPeter Hosey <prh@boredzo.org>
Wed, 11 Apr 2007 07:06:48 +0000 (11 07:06 +0000)
committerPeter Hosey <prh@boredzo.org>
Wed, 11 Apr 2007 07:06:48 +0000 (11 07:06 +0000)
treea371cbf874bfd43c6ca4015e430d75933d831062tree | snapshot (tar.gz zip)
parent2428951d7228267b59c454af4f4ac105a11c4120commit | diff
Merging [19298] from 1.0 branch.

git-svn-id: svn://svn.adiumx.com/adium/tags/AdiumX_1.0.2@19408 1c916fce-81e2-0310-a464-8ca513f45935
Frameworks/Adium Framework/Resources/en_AU.lproj/EmoticonNames.strings [new file with mode: 0644] blob
Frameworks/Adium Framework/Resources/en_CA.lproj/EmoticonNames.strings [new file with mode: 0644] blob
AdiumX SVN import