git.rot13.org Git - koha.git/commit

author	Galen Charlton <gmcharlt@gmail.com>
	Wed, 27 Jan 2010 01:26:01 +0000 (20:26 -0500)
committer	Galen Charlton <gmcharlt@gmail.com>
	Wed, 27 Jan 2010 01:26:17 +0000 (20:26 -0500)
commit	8ad2c7d7acc3cb0033426bd78928214a22ad9dd1
tree	bbd69a6e4f4294793ebd0b5333d1330c4061631b	tree \| snapshot
parent	a25eb07178da24b875391b9398a4d52a0ab43358	commit \| diff
parent	17f1530a9ac230e62595b79cfa8fd03451bb091f	commit \| diff

Merge commit 'pianohacker-koha/prefs-submit' into master

Merge in Jesse Weaver's system preference editor changes.

Conflicts:
C4/Bookfund.pm
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git

RSS Atom

C4/Context.pm	diff1 \|	diff2 \|	blob \| history
C4/Output.pm	diff1 \|	diff2 \|	blob \| history
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css	diff1 \|	diff2 \|	blob \| history
koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc	diff1 \|	diff2 \|	blob \| history
koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc	diff1 \|	diff2 \|	blob \| history
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js	diff1 \|	diff2 \|	blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl	diff1 \|	diff2 \|	blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl	diff1 \|	diff2 \|	blob \| history