Mercurial > repos > bgruening > glimmer
diff glimmer_wo_icm.xml @ 5:5a97ff1a7b12
merge
author | Bjoern Gruening <bjoern.gruening@gmail.com> |
---|---|
date | Fri, 07 Jun 2013 16:04:15 +0200 |
parents | 8ddf54417ade |
children | a07c49839f31 |
author | Bjoern Gruening <bjoern.gruening@gmail.com> |
---|---|
date | Fri, 07 Jun 2013 16:04:15 +0200 |
parents | 8ddf54417ade |
children | a07c49839f31 |