From: Stricted <Stricted@nexus-irc.de>
Date: Fri, 7 Sep 2012 19:16:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/origin2/master'
X-Git-Url: https://git.stricted.de/?p=gitweb.git;a=commitdiff_plain;h=8d84ff6e11ee04807ec0bea2bb4e17f8c64f11e2

Merge remote-tracking branch 'remotes/origin2/master'
---

8d84ff6e11ee04807ec0bea2bb4e17f8c64f11e2
diff --cc git_graph.php
index f389476,42f4813..5f660a0
--- a/git_graph.php
+++ b/git_graph.php
@@@ -1,15 -1,11 +1,16 @@@
  <?php
  
  /* CONFIG */
 +<<<<<<< HEAD
 +$repo_path = "/home/git/";
 +$project_list = null;
 +=======
  $repo_path = "/srv/gitosis/repositories/";
  $project_list = "/srv/gitosis/gitosis/projects.list";
 +>>>>>>> remotes/origin2/master
  
  $size = 20;
+ $header_height = false; //false = dynamic
  $tile_size = 20; /* do not edit */
  
  $max_branches = 30;