diff options
author | Jiří Techet <techet@gmail.com> | 2010-05-10 23:29:29 +0200 |
---|---|---|
committer | Jiří Techet <techet@gmail.com> | 2010-05-10 23:29:29 +0200 |
commit | 6ffab22ec0dfbc975b2441f6e5869ebb7a91ea77 (patch) | |
tree | c25c0aecdff0d46995cc5baebf61b0f33bd87705 /AUTHORS | |
parent | 3494c400dd959ba09e33df2132a83cafa6da0dbb (diff) | |
parent | 54f92ec2b8cf24d926830038b2c57cbfb3fc6baa (diff) | |
download | libchamplain-6ffab22ec0dfbc975b2441f6e5869ebb7a91ea77.tar.gz |
Merge branch 'LIBCHAMPLAIN_0_4_5'
Conflicts:
AUTHORS
NEWS
configure.ac
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -33,3 +33,4 @@ Tollef Fog Heen <tfheen@err.no> Andreas Henriksson <andreas@fatal.se> Jiří Techet <techet@gmail.com> Götz Waschk <waschk@mandriva.org> +Rob Bradford <rob@linux.intel.com> |