diff options
| author | Matthew Johnson <mjj29@illythia.matthew.ath.cx> | 2007-02-13 16:01:34 +0000 |
|---|---|---|
| committer | Matthew Johnson <mjj29@illythia.matthew.ath.cx> | 2007-02-13 16:01:34 +0000 |
| commit | eab042181417f39cbfba91a10fa3063537cc04a8 (patch) | |
| tree | 25624aac5fe06a8e5bb8126ea4ae3099e52f19eb /AUTHORS | |
| parent | 394366712de710e313d8fda87782f4b8aa8fce03 (diff) | |
| parent | bd0900485a378f12e54018299ff85e83f9305a1d (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/dbus/dbus-java
Conflicts:
AUTHORS
changelog
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -8,6 +8,10 @@ Remi Emonet <remi.emonet -at- inrialpes -dot- fr> Simon McVittie <simon -dot- mcvittie -at- collabora -dot- co -dot- uk> Dick Hollenbeck <dick -at- softplc -dot- com> Joshua Nichols <nichoj -at- gentoo -dot- org> +Ralf Kistner <ralf.kistner -at- gmail -dot- com> +Henrik Petander <henrik -dot- petander -at- iki -dot- fi> +Luigi Paioro <luigi -at- lambrate -dot- it> +Roberto Francisco Arroyo Moreno <robfram -at- ugr -dot- es> Steve Crane <Steve -dot Crane -at- rococosoft -dot- com> The included Viewer application was written by: |