diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 17:25:36 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 17:25:36 +0200 |
| commit | 5ccc04374652fe8040c2bbcfd1a38a03d3952045 (patch) | |
| tree | 35b8ce42ae9e5a15f09bf2c9241d7e6a7c2f9036 | |
| parent | 5f926272183679652f94543bd3f02f0acf4e6a25 (diff) | |
Revert to master branch (to ease merging).
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,7 +3,7 @@ SOURCES = ikiwiki # Git origin (with capital MOULE replaced or stripped as needed) ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE # Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed) -ikiwiki_BRANCH = scs-FLAVOR-LOCALE +ikiwiki_BRANCH = master-FLAVOR-LOCALE # modules (subproject extension names) used. Expands Git ORIGINs ikiwiki_MODULES = templates basewiki smiley # flavors used. Expands Git BRANCHes |