diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-11 09:25:43 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-11 09:25:43 -0600 |
| commit | 69960b2da287fcd59b002fbee6083506df1784f9 (patch) | |
| tree | 6690de70620175fe5d4a6b2f89b3b6b2d05abd37 /AUTHORS | |
| parent | ecc6acd2a576fcc11d51ded532f570fb29ab475e (diff) | |
| parent | 022e4bfbcb06a66552007abc8f9f329ce86c9995 (diff) | |
| download | libayatana-indicator-69960b2da287fcd59b002fbee6083506df1784f9.tar.gz libayatana-indicator-69960b2da287fcd59b002fbee6083506df1784f9.tar.bz2 libayatana-indicator-69960b2da287fcd59b002fbee6083506df1784f9.zip | |
Merging in trunk to solve conflicts
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,2 +1,2 @@ -Ted Gould <ted@canonical.com> -Cody Russell <crussell@canonical.com>
\ No newline at end of file +# Generated by Makefile at dist + |