diff options
author | Eric Sandall | 2008-03-18 20:57:21 -0700 |
---|---|---|
committer | Eric Sandall | 2008-03-18 20:57:21 -0700 |
commit | c9f8f246c7ebcf92c330c4ab45b87ddf334f1c86 (patch) | |
tree | f0d73787af3b843563896778e493d60796339ae0 /display/qingy | |
parent | f2768870408fad921bf1e2cbb8249e4edd8b4870 (diff) | |
parent | ce621b4521b60bd4b23d8c987c5166b292cb6282 (diff) |
Merge branch 'master' into xorg-modular
Conflicts:
ChangeLog
Diffstat (limited to 'display/qingy')
-rw-r--r-- | display/qingy/HISTORY | 3 | ||||
-rwxr-xr-x | display/qingy/PRE_BUILD | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY index 3ebe8e2a41..bdba96680f 100644 --- a/display/qingy/HISTORY +++ b/display/qingy/HISTORY @@ -1,3 +1,6 @@ +2008-01-28 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * PRE_BUILD: removed is_depends_enabled.function reference + 2007-04-27 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 0.9.6 Removed PATCHLEVEL diff --git a/display/qingy/PRE_BUILD b/display/qingy/PRE_BUILD index 9395dea417..36e4e7d4b6 100755 --- a/display/qingy/PRE_BUILD +++ b/display/qingy/PRE_BUILD @@ -2,10 +2,6 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && patch -p1 < $SCRIPT_DIRECTORY/shutdown.patch && -# -## Remove this after is_depends_enabled is integrated to stable sorcery. -# -source "$GRIMOIRE/is_depends_enabled.function" && if ! is_depends_enabled $SPELL emacs; then rm media/sessions/emacs && |