diff options
| author | Ask Solem <ask@celeryproject.org> | 2014-04-14 17:29:03 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2014-04-14 17:29:03 +0100 |
| commit | be3000b4c84d7503f5ef4067de44ff16d060d158 (patch) | |
| tree | fecacb0f149b067202c443b59aad3cc027a0ff1c /codegen | |
| parent | dcb8edaccd6e164d624edfab0f3120d96f707f0a (diff) | |
| parent | fe844e41ffad5691607982cbfe4054aacdcb81e0 (diff) | |
| download | rabbitmq-c-github-ask-be3000b4c84d7503f5ef4067de44ff16d060d158.tar.gz | |
Merge branch 'alanxz/master'
Conflicts:
Makefile.am
codegen
Diffstat (limited to 'codegen')
| l--------- | codegen | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -../librabbitmq/rabbitmq-codegen/
\ No newline at end of file +../rabbitmq-codegen
\ No newline at end of file |