diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
| commit | e4421c38da95569f796d29c83a54f750e5222545 (patch) | |
| tree | 3b7ac69f38e8a83d0dc58b69305011d095c5ceb0 /extra/gummiboot/loader.conf | |
| parent | 3ffe7613c97fecff8c5710dfbd44a984eaae9adc (diff) | |
| parent | 0fbe25a10dce8ec16455854ed6929b688f98cb36 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libgdamm/PKGBUILD
community/luasql/PKGBUILD
community/myodbc/PKGBUILD
community/python2-basemap/PKGBUILD
community/ruby-cairo/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/stardict/PKGBUILD
core/diffutils/PKGBUILD
core/libsasl/PKGBUILD
core/systemd/PKGBUILD
extra/anjuta/PKGBUILD
extra/ardour/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/gnokii/PKGBUILD
extra/icu/PKGBUILD
extra/libgda/PKGBUILD
extra/libmtp/PKGBUILD
extra/lighttpd/PKGBUILD
extra/mariadb/PKGBUILD
extra/mysql/PKGBUILD
extra/php/PKGBUILD
extra/qt3/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/tracker/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/lilo/PKGBUILD
libre/psi/PKGBUILD
Diffstat (limited to 'extra/gummiboot/loader.conf')
| -rw-r--r-- | extra/gummiboot/loader.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/extra/gummiboot/loader.conf b/extra/gummiboot/loader.conf deleted file mode 100644 index 75b67e0d5..000000000 --- a/extra/gummiboot/loader.conf +++ /dev/null @@ -1,2 +0,0 @@ -timeout 10 -default arch |