diff options
author | Andraž 'ruskie' Levstik | 2011-08-16 22:21:00 +0200 |
---|---|---|
committer | Andraž 'ruskie' Levstik | 2011-08-16 22:21:00 +0200 |
commit | d908c3f1b542684569a0f6c8c8411bca293e08b2 (patch) | |
tree | 143394f9af9444467f23cf5b9385ab074ae201ac /audio-drivers/oss | |
parent | 9ee4dabf11004f6584a90e05b5bb71493330d25e (diff) | |
parent | 1d0fe18bc6c5eee6e9f95804fec515c9138c1d45 (diff) |
Merge branch 'master' of /home/ruskie/sourcemage/grimoire/
Conflicts:
audio-drivers/oss/HISTORY
Diffstat (limited to 'audio-drivers/oss')
-rwxr-xr-x | audio-drivers/oss/DOWNLOAD | 1 | ||||
-rw-r--r-- | audio-drivers/oss/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/audio-drivers/oss/DOWNLOAD b/audio-drivers/oss/DOWNLOAD index 3f3d3c6f26..7a2d17c5de 100755 --- a/audio-drivers/oss/DOWNLOAD +++ b/audio-drivers/oss/DOWNLOAD @@ -1,4 +1,5 @@ if [[ $OSS_BRANCH == scm ]]; then + . $GRIMOIRE/hg_download.function hg_download else default_download diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY index e6a16741f5..b3a897bb56 100644 --- a/audio-drivers/oss/HISTORY +++ b/audio-drivers/oss/HISTORY @@ -1,3 +1,6 @@ +2011-07-25 Bor Kraljič <pyrobor@ver.si> + * DOWNLOAD: source $GRIMOIRE/hg_download.function before using hg_download + 2011-06-11 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> * DETAILS: switched scm to sf |