From 08249e086eb6e541bf535d76676d5cd426470f15 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Wed, 9 Apr 2014 12:59:54 -0400 Subject: [PATCH] Fix __init__.py and add some info to README. --- README.md | 10 ++++++++++ bitshift/__init__.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7542bad..3cb81a1 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,16 @@ bitshift bitshift is a semantic search engine for source code. +Branches +-------- + +- `master`: working, tested, version-numbered code - no direct commits; should + only accept merges from `develop` when ready to release +- `develop`: integration branch with unreleased but mostly functional code - + direct commits allowed but should be minor +- `feature/*`: individual components of the project with untested, likely + horribly broken code - branch off from and merge into `develop` when done + Documentation ------------- diff --git a/bitshift/__init__.py b/bitshift/__init__.py index d51957e..5ff6a48 100644 --- a/bitshift/__init__.py +++ b/bitshift/__init__.py @@ -1 +1 @@ -__all__ = ["config", "assets"] +from . import assets, config