From 394711ff750d2ada6fca10e1ae71ce174cf9da8b Mon Sep 17 00:00:00 2001
From: Ted Nyman <ted@ted.io>
Date: Thu, 3 Jan 2013 16:14:23 -0800
Subject: [PATCH 1/2] Add note in CONVENTIONS about inlined functions

---
 CONVENTIONS.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CONVENTIONS.md b/CONVENTIONS.md
index 10d9c8644..968aad098 100644
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -159,4 +159,14 @@ GIT_END_DECL
 #endif
 ```
 
+## Inlined functions
+
+All inlined functions must be declared as:
+
+```C
+GIT_INLINE(result_type) git_modulename_functionname(arg_list);
+```
+
+
+
 

From f783f76efb484e7d169e25721ff101b1d46e05a5 Mon Sep 17 00:00:00 2001
From: Ted Nyman <ted@ted.io>
Date: Thu, 3 Jan 2013 16:15:52 -0800
Subject: [PATCH 2/2] Remove whitespace

---
 CONVENTIONS.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CONVENTIONS.md b/CONVENTIONS.md
index 968aad098..1e909a3e8 100644
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -167,6 +167,3 @@ All inlined functions must be declared as:
 GIT_INLINE(result_type) git_modulename_functionname(arg_list);
 ```
 
-
-
-