From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Tue, 14 Jun 2011 10:32:59 +0000 (-0400)
Subject: Merge branch 'gilbert-ext4-murano' of git://github.com/lapilofu/philo into gilbert... 
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/b1187c750167bfbdb0c50f62923d11ad77d26a34?ds=sidebyside;hp=-c

Merge branch 'gilbert-ext4-murano' of git://github.com/lapilofu/philo into gilbert-ext4

* 'gilbert-ext4-murano' of git://github.com/lapilofu/philo: (84 commits)
  Putting borders on panels was always a mistake. Undone now.
  More tab styles.
  Grid row editor styles.
  Fixed vertical separators.
  Make grid selection stand out more.
  Added shadows to windows, woooooo.
  Made panels more obvious. Modified the style of windows to have square bottom corners.
  Lots of style updates.
  Readme update.
  Moved the config.rb file to a place where it makes more sense. Added a readme.
  Initialized the submodules.
  Updating paths for submodules.
  Added submodules back in.
  Replaced the old murano with the new.
  Minor tweaks to the sobol results templates.
  Removed outdated RecurseNavigationMarker code and added filtered interpretation of the recursenavigation's key argument. Currently falls back to old behavior, but new code should use quoted strings for literals.
  Moved gilbert-related code to match the distutil changes.
  Added version import from philo and made stylistic tweaks to docstrings.
  Updated entity/attribute docs - moved documentation into class/method/etc docstrings and set up autodocs use.
  Moved philo files into a philo subdirectory and added a setup.py file. Philo can now be used with distutils.
  ...
---

b1187c750167bfbdb0c50f62923d11ad77d26a34