From: Lei Xia <lxia@northwestern.edu>
Date: Mon, 16 Nov 2009 23:21:28 +0000 (-0600)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=8f7ca44fc807d2e015c135153ee631ef2001fe30;hp=2e5e10d872cf06c2ee634bf8a79c33f612433a34

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel
---

diff --git a/palacios.png b/misc/palacios.png
similarity index 100%
rename from palacios.png
rename to misc/palacios.png