Skip to main content

Browse the archive

Revision 212d781c967317a05a704609ddf3ffc8a09f8590 authored by Junio C Hamano on 26 August 2014, 18:16:25 UTC, committed by Junio C Hamano on 26 August 2014, 18:16:25 UTC 
Merge branch 'jk/fix-profile-feedback-build'
 
Fix profile-feedback build broken in 2.1 for tarball releases.

* jk/fix-profile-feedback-build:
  Makefile: make perf tests optional for profile build
2 parent s c285171 + 93b5393
Raw File
merge-blobs.h 
#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H

#include "blob.h"

extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);

#endif /* MERGE_BLOBS_H */
back to top