Commit graph

873 commits

Author SHA1 Message Date
bsx
0e0f2439be create proper header for filesystem util functions 2011-12-17 20:07:31 +01:00
bsx
a038463097 added rgb-flame code 2011-12-17 18:37:23 +01:00
schneider
9e7b12d5a0 fixed up bridge 2011-12-17 01:59:54 +01:00
schneider
eea6fc740b renamed bridge 2011-12-17 01:58:16 +01:00
schneider
84186e3ff1 renamed the bridge 2011-12-17 01:49:47 +01:00
schneider
1448c19e1c r_player: removed old code 2011-12-16 03:07:36 +01:00
schneider
d51f5c9caf remote: added nick transport 2011-12-16 03:04:31 +01:00
schneider
8978eca3fa r_player: cleanup 2011-12-16 01:15:25 +01:00
schneider
d388a0b335 r_player: changed default mac, added more feedback 2011-12-16 01:10:27 +01:00
schneider
b7610d29e7 r_player: removed old code, fixed up rf parameter handling 2011-12-16 00:52:26 +01:00
schneider
2190feafcc disabled CRP in linker script 2011-12-12 21:06:57 +01:00
schneider
50fd8a6613 bridge: default maclen 32bytes 2011-12-12 18:01:01 +01:00
schneider
e359032580 structs neeed to be packed, added some dbg output 2011-12-12 18:00:14 +01:00
schneider
a33cafde2f Merge branch 'master' of github.com:r0ket/r0ket 2011-12-11 23:21:04 +01:00
lilafisch
af28f49b03 Merge branch 'master' of github.com:r0ket/r0ket 2011-12-11 18:45:31 +01:00
lilafisch
da328de204 find games, join games, display text from game 2011-12-11 18:42:40 +01:00
schneider
6e30f473f7 removed old lodable dir 2011-12-11 18:39:50 +01:00
schneider
50e16d52cd ew do not encrypt l0dables anymore 2011-12-11 18:39:19 +01:00
schneider
b2dc462ce7 rf-io: fixed small error 2011-12-11 18:38:40 +01:00
schneider
bebae321e2 fixed some compiler warnings, removed dead code 2011-12-11 18:37:53 +01:00
schneider
6c824d91a1 small error with position leds 2011-12-11 18:32:34 +01:00
schneider
4c7669af24 encode packets sent to usb 2011-12-11 18:24:11 +01:00
schneider
c02b227987 added bridge protocol 2011-12-11 16:15:05 +01:00
schneider
02036634d4 added rf-io application 2011-12-11 16:13:46 +01:00
schneider
69235e7409 removed crp 2011-12-11 16:13:29 +01:00
schneider
112bc97dc6 usbcdc: first think, then commit 2011-12-11 00:26:11 +01:00
schneider
ba930408f6 usbcdc: i don't trust these ring buffers... 2011-12-11 00:20:38 +01:00
schneider
29efa4cae9 Merge branch 'master' of github.com:r0ket/r0ket 2011-12-10 21:41:53 +01:00
schneider
2edc933ce0 speed up for cdc 2011-12-10 21:39:32 +01:00
schneider
5704ce08cb disabled usb interrupts in WriteEP 2011-12-10 21:39:04 +01:00
lilafisch
95cde1077d first structure for game interface l0dable 2011-12-08 01:36:49 +01:00
Stefan `Sec` Zehl
7193ee5972 Add old rudimentary rem0te code 2011-11-19 20:36:16 +01:00
schneider
b388fbe9a5 made scope l0dable work as intended 2011-08-22 23:19:58 +02:00
schneider
70506bee95 added geiger counter, pongo and scope l0dables 2011-08-22 22:36:35 +02:00
schneider
778b1da2b9 added nick_plasma l0adable 2011-08-22 22:27:21 +02:00
schneider
afbe1749a0 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-22 22:19:43 +02:00
schneider
9bc0c77770 added bricks l0dable 2011-08-22 22:19:20 +02:00
Stefan `Sec` Zehl
01dd639c1c Fix half-exploit: do not allow 0-byte loadables (padded to 16 bytes for MAC) 2011-08-22 22:04:12 +02:00
Stefan `Sec` Zehl
97de719738 Make CRP level selectable. Default to no CRP. 2011-08-22 21:59:18 +02:00
Stefan `Sec` Zehl
d46df57ea1 Fix uninitialized variable problem for l0dables. 2011-08-22 21:49:38 +02:00
Stefan `Sec` Zehl
5b0965caa8 Remove debug pixel.
I got enough questions about this pixel. It was there so you could distinguish
between the firmware nick-display, and the l0dable nick-display.
2011-08-22 01:53:58 +02:00
Stefan `Sec` Zehl
f27683bba7 Don't display comment if charging.
Suggested multiple times, Also: issue#6
2011-08-22 01:40:25 +02:00
Stefan `Sec` Zehl
bcd9978198 Add lcdRead test. Please tell me what your display returns (esp. color displays) 2011-08-22 01:22:35 +02:00
Stefan `Sec` Zehl
a22c2dd60b Fix lcdRead().
reading ID1/ID2/ID3/VM appears to work. reading ID4 or TEMP hangs/crashes the display. Currently no idea why.
2011-08-22 01:19:42 +02:00
Stefan `Sec` Zehl
0b51bdbd42 Fix the black pixels at the top left in lcdLoadImage.
readFile was originally inteded as a string read function. Fix it to read binary, and add readTextFile for the other case.
2011-08-21 19:10:08 +02:00
Stefan `Sec` Zehl
af598b3f3e Fix random dataflash corruption in usb mass storage mode.
Problem was that usbmsc does spi from the irq, and the queue() also does spi. And of course spi is non-reentrant.
Fix this by disabling the queue here. For now.
2011-08-21 18:45:23 +02:00
Stefan `Sec` Zehl
1cc22ba817 Release camp-secret-keys to the world.
Have fun.
2011-08-16 11:19:34 +02:00
Stefan Tomanek
33fe346942 add w0rpcore nickname l0dable
This l0dable by Benedikt Roth and Stefan Tomanek serves as your main
viewscreen, displaying your nickname the way you want it, and lets the
stars zoom by. You can accelerate your vessel by pushing the joystick
upwards or bring it to a halt by pressing it down - leaving your ship
drifting in the endless space. Attach two LEDs to the modulbus
connectors (SS2->GND, SS5->GND), so your r0ket can light up its nacelles
when breaking the warp barrier.
2011-08-13 20:18:15 +02:00
schneider
d9761c9d64 workshop nik: small fix 2011-08-13 16:15:43 +02:00
schneider
c974cfc072 workshop nik: play little melody 2011-08-13 16:01:33 +02:00
schneider
0eaf74fa87 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-13 01:10:59 +02:00
schneider
d8bca43628 new nick animation with police sound 2011-08-13 01:09:40 +02:00
Stefan `Sec` Zehl
df82442138 Some mesh beauty :-) 2011-08-13 00:56:39 +02:00
Stefan `Sec` Zehl
0c2d4c5420 Whoops. This shouldn't be here. And even if, not in the middle. 2011-08-13 00:42:58 +02:00
schneider
65399a51f5 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-12 23:46:47 +02:00
schneider
f9018b2195 added l0dable for workshop kit 2011-08-12 23:46:19 +02:00
Thammi
7f15ac9a4c Fixing village name 2011-08-12 23:08:45 +02:00
Stefan `Sec` Zehl
bddd82561d Merge branch 'master' of github.com:r0ket/r0ket 2011-08-12 22:25:06 +02:00
Stefan `Sec` Zehl
bfac51e4ff Mini short-range chat app. 2011-08-12 22:24:37 +02:00
Thammi
472b269d12 Merge branch 'master' of git://github.com/r0ket/r0ket 2011-08-12 21:42:40 +02:00
Thammi
e0ad56aebc Removing pizzaware licence to use bsd 2011-08-12 21:42:13 +02:00
Thammi
e3b1ff3a22 Getting personal when losing tron 2011-08-12 21:41:06 +02:00
schneider
b76529cdb1 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-12 21:39:03 +02:00
schneider
2d90f2bb8b added first draft for music playing l0dable with vectors in ram 2011-08-12 21:38:22 +02:00
Stefan `Sec` Zehl
13d2192496 Fix warnings 2011-08-12 21:21:11 +02:00
Stefan `Sec` Zehl
b9aafa37d4 small fixes 2011-08-12 21:11:41 +02:00
Stefan `Sec` Zehl
0460c175cb Slow down the game 2011-08-12 21:10:46 +02:00
ranzwertig
8f4d81f8f4 added randomInit and increased speed 2011-08-12 20:51:58 +02:00
ranzwertig
36f8eb4292 added rtype port for r0ket 2011-08-12 20:51:36 +02:00
Stefan `Sec` Zehl
b6d407179f Small fixes 2011-08-12 20:50:25 +02:00
Thammi
c4642dd951 Merge branch 'master' of git://github.com/r0ket/r0ket 2011-08-12 20:48:20 +02:00
Mario Volke
fb9bef02ff added game r0ket JUMP 2011-08-12 20:47:21 +02:00
Stefan `Sec` Zehl
177acbeffa Restore state of LED at end 2011-08-12 20:27:36 +02:00
Stefan `Sec` Zehl
736959d47c Turn off LED at end 2011-08-12 20:26:55 +02:00
Stefan `Sec` Zehl
97e35677db Make simulat0r build work again 2011-08-12 20:25:27 +02:00
Stefan `Sec` Zehl
4ec0525b3a Fix ifdef check to be more correct 2011-08-12 20:24:56 +02:00
Sec
9cafb1670a Merge pull request #13 from raimue/simulat0r-macosx
Fix building simulat0r on Mac OS X #2
2011-08-12 11:21:03 -07:00
Sec
d66ce0c42c Merge pull request #12 from f1ori/master
nickname on nick_matrix
2011-08-12 11:19:55 -07:00
Stefan `Sec` Zehl
39efe08dab Add starfield loadable 2011-08-12 20:17:11 +02:00
Stefan `Sec` Zehl
d8d056e5ef Add simple static screen based on idea by SvOlli 2011-08-12 20:13:19 +02:00
Stefan `Sec` Zehl
426972d291 Add nick_time animation from SvOlli 2011-08-12 20:07:09 +02:00
Stefan `Sec` Zehl
384a72af81 Make debug more usable, also omit CRC from packets 2011-08-12 19:18:48 +02:00
Rainer Mueller
35b92adcfc No section attribute on Mac OS X
This attribute isn't compatible with Mach-O, so avoid this when building
simulat0r on Mac OS X.
2011-08-12 19:10:39 +02:00
Rainer Mueller
f9982c226f Avoid duplicate symbols in usbhid.o and usbmsc.o 2011-08-12 19:10:38 +02:00
Sec
af90e5646d Merge pull request #7 from astro/master
debug menu: browse mesh pkt details
2011-08-12 08:35:08 -07:00
Stefan `Sec` Zehl
dbc8bb287a Change default back to default display 2011-08-12 15:58:19 +02:00
the_nihilant
ea4f163658 add basic Nokia 1600 color display support 2011-08-12 15:56:52 +02:00
Stefan `Sec` Zehl
51a1b20f3e Reenable chargeled config option 2011-08-12 15:54:21 +02:00
Benjamin Neff
0397197d60 reenable charge led and workaround for daytrig 2011-08-12 15:54:06 +02:00
Florian Richter
423df99c9a nick_matrix: show nick on random locations 2011-08-12 15:14:48 +02:00
Florian Richter
ff98c7de21 nick_matrix: show/hide nickname in center 2011-08-12 15:07:56 +02:00
Stefan `Sec` Zehl
198d91a86e rumpeltux found this typo 2011-08-12 14:22:51 +02:00
Hagen Fritsch
87b1b9e2cf l0dable/invaders.c: fix potential buffer overflow 2011-08-12 14:21:42 +02:00
Hagen Fritsch
77fb7a388a fix buffer overflow in font handler 2011-08-12 14:21:05 +02:00
Stefan `Sec` Zehl
b605025acf Fix invaders nickdisplay 2011-08-12 13:27:38 +02:00
Stefan `Sec` Zehl
ffb4dae48c Merge commit 'ba34771069f48c83aa76' 2011-08-12 03:06:49 +02:00
Stefan `Sec` Zehl
03f2f8a7d3 make matrix a nickname replacement. Also make it work queue 2011-08-12 02:59:33 +02:00
Florian Richter
22dcb53673 matrix animation as l0dable 2011-08-12 01:39:21 +02:00
Stefan `Sec` Zehl
493396a597 Move snake aside until the gfx library is back 2011-08-11 18:31:07 +02:00
Thammi
efbb72a31d Adding author and license information to tron 2011-08-11 17:42:30 +02:00
Thammi
9c9c052145 Merge branch 'master' of git://github.com/r0ket/r0ket 2011-08-11 17:36:12 +02:00
Thammi
0403e99362 Adding a very small tron/snake like game 2011-08-11 17:35:17 +02:00
Stefan `Sec` Zehl
a0ebf87a4c Revert "Updates"
This reverts commit 83e3ad20b9.
remove hacking
2011-08-11 15:59:17 +02:00
Stefan `Sec` Zehl
83e3ad20b9 Updates 2011-08-11 12:35:09 +02:00
NiciDieNase
ba34771069 Added SpaceInvaders Nick-Animation 2011-08-11 10:51:02 +02:00
Stefan `Sec` Zehl
3bf8d5f903 Sorry. Can't get it to fit for now, so disable graphics lib
This does brak the rokets l0dable. Will try to fix this after the camp
2011-08-11 10:27:21 +02:00
Stefan `Sec` Zehl
35f875eb6c add support for crypting l0dables in Makefile 2011-08-11 10:16:55 +02:00
Stefan `Sec` Zehl
de02a6ccbc Add showlcd l0dable given to me late at night 2011-08-11 09:25:19 +02:00
Stefan `Sec` Zehl
7cbc87b3a6 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-11 09:25:03 +02:00
Stefan `Sec` Zehl
0acd7a78e2 Improve filter support in serial tester app 2011-08-11 09:22:58 +02:00
Stefan `Sec` Zehl
63d3a3687a Remove broken chargeled feature 2011-08-11 09:22:22 +02:00
Stefan `Sec` Zehl
9c5aaf715f Disable some code to save space 2011-08-11 09:16:31 +02:00
Stefan `Sec` Zehl
2d18e75362 Fix initialisation. Somehow l0dables sometimes don't init correctly 2011-08-11 09:15:29 +02:00
roy rocket
de266e50b4 user added l0dable snake 2011-08-11 06:23:43 +02:00
Astro
7856109562 debug menu, mesh info: browse pkt details 2011-08-11 01:53:54 +02:00
roy rocket
7d79419f55 user supplied l0dables: leiwand demo and tedliz game 2011-08-11 01:06:01 +02:00
schneider
7d2b80eae9 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-10 16:30:56 +02:00
schneider
345bae9e20 added showcard source 2011-08-10 13:43:02 +02:00
Stefan `Sec` Zehl
6452d305c2 Clamp value types and add debugging-panic on violation 2011-08-10 04:25:50 +02:00
Stefan `Sec` Zehl
1e7fbbe807 Move public mesh to different channel to keep debugging easier. 2011-08-09 19:39:37 +02:00
Stefan `Sec` Zehl
20b939926f New loadable "voltage" 2011-08-09 00:11:16 +02:00
Stefan `Sec` Zehl
0f1303800d Just a hint of options 2011-08-07 01:52:05 +02:00
Stefan `Sec` Zehl
b977665f0f Merge branch 'master' of github.com:r0ket/r0ket 2011-08-07 01:44:57 +02:00
Stefan `Sec` Zehl
75ec951d73 First attemt at serial connection 2011-08-07 01:44:25 +02:00
roy rocket
456ec10713 Fixed declaration f00 2011-08-06 18:59:37 +02:00
Stefan `Sec` Zehl
9f963642b3 rudimentary filter stuff 2011-08-06 17:32:22 +02:00
bernd
5c9d624a7b Fix warning 2011-08-06 16:54:47 +02:00
bernd
b99031694a Disable memcpy/memmove optimazation in simulat0r, it collides with the efforts not to interfere with libc 2011-08-06 16:41:58 +02:00
Stefan `Sec` Zehl
d56dbaf07b Enhance serial badge stuff. 2011-08-06 16:24:50 +02:00
roy rocket
a76eab9218 No "jumping", some auto speed adjustments based on renderspeed 2011-08-06 09:56:52 +02:00
schneider
f95004d5ee fix in nick scroll 2011-08-06 07:16:16 +02:00
schneider
cf5f06b228 workrarounds in vcard 2011-08-06 07:16:03 +02:00
schneider
31355b6a4a release config values 2011-08-06 07:15:26 +02:00
schneider
707faf0266 impoved initial code 2011-08-06 07:15:13 +02:00
Stefan `Sec` Zehl
6721b93d53 nicer loadable 2011-08-06 04:37:04 +02:00
Stefan `Sec` Zehl
94f0092c93 delay in initial before formatting 2011-08-06 04:28:56 +02:00
roy rocket
413e1dbdc2 faster sc0lling 2011-08-06 03:48:52 +02:00
roy rocket
e9927488d1 Better scr0ller 2011-08-06 03:37:55 +02:00
roy rocket
910e8d8416 Nick scr0ller 2011-08-06 03:32:59 +02:00
Stefan `Sec` Zehl
6788c89f02 fix offsets 2011-08-06 03:05:36 +02:00
Stefan `Sec` Zehl
ea6638c795 save some more bytes 2011-08-06 02:43:32 +02:00
Stefan `Sec` Zehl
aba4a949a9 Make openbeacon behave on funk config 2011-08-06 02:41:40 +02:00
Stefan `Sec` Zehl
feb5db7328 Smaller time (100b) 2011-08-06 02:38:06 +02:00
Stefan `Sec` Zehl
a659245364 improve vector lib 2011-08-06 02:37:43 +02:00
Stefan `Sec` Zehl
0bb18cea72 Support unencrypted c0d 2011-08-06 01:20:36 +02:00
schneider
7acf91fabe restored openbeacon config filename 2011-08-05 23:35:25 +02:00
schneider
592dbfffff save some bytes by disabling the busint 2011-08-05 23:34:52 +02:00
schneider
e9d6de9f2c added position leds 2011-08-05 23:33:31 +02:00
schneider
97d33bf402 save 32 bytes in openbeacon 2011-08-05 22:55:46 +02:00
schneider
03b632648d save 9 bytes 2011-08-05 22:44:16 +02:00
schneider
9fb33abe8b release: crypt and sign with different keys 2011-08-05 22:32:20 +02:00
schneider
8a5c93be66 l0dables: check file size 2011-08-05 22:32:00 +02:00
schneider
cca3c4ccad longer isp and reset delays 2011-08-05 20:38:21 +02:00
schneider
ae5a7c3f07 ugly hack vor voltage reading 2011-08-05 20:15:59 +02:00
schneider
bbc739589b Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 19:58:22 +02:00
schneider
0fada18915 executor: fail better :) 2011-08-05 19:57:47 +02:00
Stefan `Sec` Zehl
019fa4ac88 ENCRYPT. WE ARE APPLE! :-) 2011-08-05 19:55:29 +02:00
Stefan `Sec` Zehl
07675caeb2 Make lcdBacklight changes work 2011-08-05 19:24:58 +02:00
Stefan `Sec` Zehl
aa986a15c8 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 19:18:50 +02:00
Stefan `Sec` Zehl
6bf6f3de96 Commit of pippin vector/graphics lib. Yay! 2011-08-05 19:17:31 +02:00
schneider
1ae175c424 added keys for l0dables 2011-08-05 19:05:03 +02:00
Stefan `Sec` Zehl
8f164185f1 This file is autogenerated 2011-08-05 18:55:24 +02:00
Stefan `Sec` Zehl
b1b5516b42 Move ramcode to clean address. Also sort exported symbols and add a few 2011-08-05 18:53:40 +02:00
Stefan `Sec` Zehl
72e04c1d38 Fix warnings. 2011-08-05 18:11:37 +02:00
Stefan `Sec` Zehl
c2ff7c3060 tiny fs has no unlink in release mode 2011-08-05 17:53:18 +02:00
Stefan `Sec` Zehl
07081cb94c Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 17:45:11 +02:00
Stefan `Sec` Zehl
11092e59f1 Schneider found a bug 2011-08-05 17:44:45 +02:00
schneider
05fc825df8 added encryption keys for l0dables 2011-08-05 17:39:00 +02:00
schneider
31deb031f5 fiexed a warning in night.c 2011-08-05 16:54:45 +02:00
Stefan `Sec` Zehl
3f1da363e2 Fix releasescript. Doesn't need protect anymore. compiler does it. 2011-08-05 16:16:32 +02:00
Stefan `Sec` Zehl
02f73632ad Who in their STUPID mind decided that the CRP flag is INSIDE your CODE SPACE?
ARGH ARGH ARGH!
2011-08-05 16:13:14 +02:00
Stefan `Sec` Zehl
42b1114e7e CRP2 doesn't work. I have no idea why. 2011-08-05 15:31:32 +02:00
Stefan `Sec` Zehl
b09db6ef9a Save a few more bytes by making memcpy memmove 2011-08-05 15:17:36 +02:00
Stefan `Sec` Zehl
f5fdb1d5dd Move font into invaders. Smaller main firmware, yay 2011-08-05 15:17:05 +02:00
Stefan `Sec` Zehl
b512225cfd Add missing wait in uuid 2011-08-05 15:04:48 +02:00
Stefan `Sec` Zehl
5e6141d7b8 Develmode is develmode 2011-08-05 15:00:00 +02:00
Stefan `Sec` Zehl
a55c36e9f6 Actually save nickl0dable choice 2011-08-05 14:57:22 +02:00
Stefan `Sec` Zehl
e765ad37a3 remove double Refresh() 2011-08-05 14:53:24 +02:00
Stefan `Sec` Zehl
880a1679d8 Fix lpcfix -h, also protect firmware 2011-08-05 14:48:36 +02:00
Stefan `Sec` Zehl
0adf209074 Make an nick_anim and nick_image 2011-08-05 14:40:07 +02:00
Stefan `Sec` Zehl
0fab1cac2e Manage release-keys 2011-08-05 12:59:26 +02:00
iggy
1e517d51ed Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 12:12:51 +02:00
iggy
2285fae1a1 mandel buxfix 2011-08-05 12:12:36 +02:00
Stefan `Sec` Zehl
4face91162 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 11:54:51 +02:00
Stefan `Sec` Zehl
1bfd14c17d make develmode work 2011-08-05 11:54:36 +02:00
Stefan `Sec` Zehl
26d0ff0b19 Mesh now back working. 2011-08-05 11:54:20 +02:00
Stefan `Sec` Zehl
49a78b1907 Revert "Revert "Schnitzel support""
This reverts commit e2d2ba2cbd.
2011-08-05 11:44:57 +02:00
Stefan `Sec` Zehl
e2d2ba2cbd Revert "Schnitzel support"
This reverts commit eb9051aa7d.
2011-08-05 11:31:34 +02:00
roy rocket
e1124fb952 Merge branch 'master' of ssh://github.com/r0ket/r0ket 2011-08-05 11:15:27 +02:00
roy rocket
270153d883 ENTER is now exit. Speed options optimized. 2011-08-05 11:14:20 +02:00
Stefan `Sec` Zehl
117396bd88 Disable chargeled by default. Nobody tested it, and I suspect it's broken 2011-08-05 10:57:43 +02:00
Stefan `Sec` Zehl
5adc1877ba Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 10:38:55 +02:00
roy rocket
a2d68fa410 Merge branch 'master' of ssh://github.com/r0ket/r0ket 2011-08-05 10:33:36 +02:00
roy rocket
381628aea0 Multiple Speed Options 2011-08-05 10:33:09 +02:00
Stefan `Sec` Zehl
eb9051aa7d Schnitzel support 2011-08-05 10:29:39 +02:00
Stefan `Sec` Zehl
b025dcf409 set FINAL define on release-build 2011-08-05 10:26:24 +02:00
Stefan `Sec` Zehl
a402918828 reset font on return to menu 2011-08-05 10:25:31 +02:00
Stefan `Sec` Zehl
76c19fff94 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 10:22:53 +02:00
roy rocket
ae07f36fde New Nick Scroller 2011-08-05 09:46:49 +02:00
roy rocket
2c8ed04b53 Merge branch 'master' of ssh://klon2.itfuzzi.de/home/pubgit/r0ket 2011-08-05 08:56:22 +02:00