Merge branch 'master' of github.com:brmlab/brmbar

Conflicts:
	Makefile
	brmbar.c
This commit is contained in:
Pavol Rusnak 2011-04-22 03:56:44 +02:00
commit 3d8cbd98b4
5 changed files with 92 additions and 26 deletions

View file

@ -1,2 +1,8 @@
4029764001807 Club Mate 0.5L 35
4029764001821 Club Mate 0.33L 25
cred50 Credit 50
cred100 Credit 100
cred200 Credit 200
cred500 Credit 500
cred1000 Credit 1000
status Status 0
4029764001807 Club Mate 0.5L -35
4029764001821 Club Mate 0.33L -25