git.rot13.org Git - osmocom-bb.git/commit

author	Harald Welte <laforge@gnumonks.org>
	Fri, 25 Jun 2010 00:55:59 +0000 (02:55 +0200)
committer	Harald Welte <laforge@gnumonks.org>
	Fri, 25 Jun 2010 00:58:15 +0000 (02:58 +0200)
commit	f0e18a70586ad265edb81855f6e3cd6f784b89df
tree	40dba6a4814fcef3218395c42a0c71d05c00b5c4	tree \| snapshot
parent	bc860c43c291304866cc6fc5ca9acc9499853d06	commit \| diff
parent	816e24cb4296d6b7110da4a89661bbac8dc7af21	commit \| diff

Merge commit '816e24cb4296d6b7110da4a89661bbac8dc7af21' into libosmocore

Conflicts:
src/shared/libosmocore/include/osmocore/protocol/gsm_04_08.h

36 files changed:

src/shared/libosmocore/Makefile.am	diff1 \|	\|	blob \| history
src/shared/libosmocore/configure.in	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/Makefile.am	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocom/Makefile.am	\|	\|	blob
src/shared/libosmocore/include/osmocom/vty/Makefile.am	\|	\|	blob
src/shared/libosmocore/include/osmocom/vty/buffer.h	\|	\|	blob
src/shared/libosmocore/include/osmocom/vty/command.h	\|	\|	blob
src/shared/libosmocore/include/osmocom/vty/logging.h	\|	\|	blob
src/shared/libosmocore/include/osmocom/vty/telnet_interface.h	\|	\|	blob
src/shared/libosmocore/include/osmocom/vty/vector.h	\|	\|	blob
src/shared/libosmocore/include/osmocom/vty/vty.h	\|	\|	blob
src/shared/libosmocore/include/osmocore/Makefile.am	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocore/gsm0808.h	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocore/gsm48.h	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocore/gsm_utils.h	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocore/logging.h	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocore/msgb.h	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocore/protocol/Makefile.am	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocore/protocol/gsm_04_08.h	diff1 \|	\|	blob \| history
src/shared/libosmocore/include/osmocore/rate_ctr.h	\|	\|	blob
src/shared/libosmocore/libosmovty.pc.in	\|	\|	blob
src/shared/libosmocore/src/Makefile.am	diff1 \|	\|	blob \| history
src/shared/libosmocore/src/gsm0808.c	diff1 \|	\|	blob \| history
src/shared/libosmocore/src/gsm48.c	diff1 \|	\|	blob \| history
src/shared/libosmocore/src/gsm_utils.c	diff1 \|	\|	blob \| history
src/shared/libosmocore/src/logging.c	diff1 \|	\|	blob \| history
src/shared/libosmocore/src/msgb.c	diff1 \|	\|	blob \| history
src/shared/libosmocore/src/rate_ctr.c	\|	\|	blob
src/shared/libosmocore/src/vty/Makefile.am	\|	\|	blob
src/shared/libosmocore/src/vty/buffer.c	\|	\|	blob
src/shared/libosmocore/src/vty/command.c	\|	\|	blob
src/shared/libosmocore/src/vty/logging_vty.c	\|	\|	blob
src/shared/libosmocore/src/vty/telnet_interface.c	\|	\|	blob
src/shared/libosmocore/src/vty/utils.c	\|	\|	blob
src/shared/libosmocore/src/vty/vector.c	\|	\|	blob
src/shared/libosmocore/src/vty/vty.c	\|	\|	blob

Unnamed repository; edit this file to name it for gitweb.

RSS Atom