Commit graph

164 commits

Author SHA1 Message Date
erlehmann
ec9b764967 this doesn't work i know it
git-svn-id: http://yolanda.mister-muffin.de/svn@242 7eef14d0-6ed0-489d-bf55-20463b2d70db
2008-03-02 09:56:02 +00:00
josch
e59c37e102 converted tabs to spaces in all xsl files
git-svn-id: http://yolanda.mister-muffin.de/svn@240 7eef14d0-6ed0-489d-bf55-20463b2d70db
2008-02-14 22:23:25 +00:00
erlehmann
6ad0e6c278 prefix variable names that specify a path with path_ instead of page_
git-svn-id: http://yolanda.mister-muffin.de/svn@237 7eef14d0-6ed0-489d-bf55-20463b2d70db
2008-02-14 15:23:28 +00:00
erlehmann
a038706762 deleted mockup, added mplayer, vlc icons; also, flash sucks
git-svn-id: http://yolanda.mister-muffin.de/svn@236 7eef14d0-6ed0-489d-bf55-20463b2d70db
2008-02-12 01:44:18 +00:00
erlehmann
cc83540aa2 several html + css layout changes (incomplete)
git-svn-id: http://yolanda.mister-muffin.de/svn@232 7eef14d0-6ed0-489d-bf55-20463b2d70db
2008-02-06 07:01:45 +00:00
erlehmann
357dcf431e added opensearch description and crime detection (required by german
federal police)


git-svn-id: http://yolanda.mister-muffin.de/svn@231 7eef14d0-6ed0-489d-bf55-20463b2d70db
2008-01-12 21:45:19 +00:00
erlehmann
27f59d3d3e opensearch stuff, badly implemented
git-svn-id: http://yolanda.mister-muffin.de/svn@230 7eef14d0-6ed0-489d-bf55-20463b2d70db
2008-01-11 00:47:07 +00:00
erlehmann
bbb7ed61a7 lost track of my changes, enjoy this useless comment
git-svn-id: http://yolanda.mister-muffin.de/svn@229 7eef14d0-6ed0-489d-bf55-20463b2d70db
2008-01-05 15:11:56 +00:00
josch
37b75b5801 added settings changed message, fixed NaN bug from last commit, fixed rights and license in the upload wizard, added message value
git-svn-id: http://yolanda.mister-muffin.de/svn@227 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-29 04:51:14 +00:00
josch
2b40d41c1a fixed viewcount, fixed time calculation, fixed video filesize, fixed rss, fixed codec regex, fixed viewed content length, fixed one result redirect on multiple pages, fixed query string regex
git-svn-id: http://yolanda.mister-muffin.de/svn@226 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-29 04:23:11 +00:00
josch
82c0a8e834 added advancedsearch
git-svn-id: http://yolanda.mister-muffin.de/svn@223 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-27 15:15:49 +00:00
erlehmann
85193bf24e 24c3, ihr pfeifen !
git-svn-id: http://yolanda.mister-muffin.de/svn@222 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-27 15:01:49 +00:00
josch
f49a7367e9 fixed cortado user settings bug, saved cortado settings for all users (not only logged in) in cookie, fixed non ascii bug in search query, changed user table layout, added advancedsearch entry
git-svn-id: http://yolanda.mister-muffin.de/svn@221 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-27 14:50:08 +00:00
erlehmann
24f536e1e8 big change
git-svn-id: http://yolanda.mister-muffin.de/svn@220 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-27 01:54:22 +00:00
josch
f49b878f31 deleted notice, derivativework, sharealike, commercialuse and dc.contributor from database tables as they were never used, redirect to video if lucky search or only 1 result, noquery as error message not warning, added http-content-length for downloads, removed status from search, added rights and license and cc support to upload process, redirect to frontpage after successful upload
git-svn-id: http://yolanda.mister-muffin.de/svn@219 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-22 12:30:11 +00:00
josch
1c7d1d82aa added sort: and orderby: to our query language, replaced sucky mime type for download, removed check for upload failure every pageload, global default and max-pagesize, added xspf download filename, added pagesize to rss query, redirect to frontpage after empty query, output value for messageboxes on index page, redirect to main page when zero results or when no query was given
git-svn-id: http://yolanda.mister-muffin.de/svn@218 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-21 17:39:49 +00:00
erlehmann
751ed83d13 fixin josch's retarded use of <h1>, <div> and other html elements
git-svn-id: http://yolanda.mister-muffin.de/svn@217 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-20 17:08:11 +00:00
erlehmann
e870bcc211 fixed rss <link/> error
git-svn-id: http://yolanda.mister-muffin.de/svn@216 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-20 08:54:35 +00:00
erlehmann
efad2e4a58 value -> query
git-svn-id: http://yolanda.mister-muffin.de/svn@215 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-20 08:23:55 +00:00
josch
09eca66dad removed scriptname, argument, value, sort and orderby from GET parameters
git-svn-id: http://yolanda.mister-muffin.de/svn@214 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-19 23:32:01 +00:00
josch
fee846b3c1 complete renaming and moving account.xsl to settings.xsl
git-svn-id: http://yolanda.mister-muffin.de/svn@213 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-19 23:18:26 +00:00
josch
b918e1eef4 rename all account occurrences to settings
git-svn-id: http://yolanda.mister-muffin.de/svn@212 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-19 23:12:39 +00:00
erlehmann
2c3acd9344 XSL null output, basic RSS feed
git-svn-id: http://yolanda.mister-muffin.de/svn@211 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-19 15:30:00 +00:00
erlehmann
93d21c2272 interface goodness
git-svn-id: http://yolanda.mister-muffin.de/svn@203 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-17 19:54:04 +00:00
josch
980f33fc1f added browser sniffing to parse xml to xhtml server side
git-svn-id: http://yolanda.mister-muffin.de/svn@202 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-17 18:55:33 +00:00
josch
52ba4dadb1 connecting to db only once, fixed referer regex, added user preferences, information on empty results, correcting the spelling of my nick, fixed space bug with libxslt, sanitized settings interface, repaired results.xsl, videos and thumbnails now only have a max hight, videos get resized
git-svn-id: http://yolanda.mister-muffin.de/svn@201 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-17 12:38:02 +00:00
erlehmann
666fa10be9 search results now use css-property "display:inline-block"
added (non-functional) button for "advanced" search


git-svn-id: http://yolanda.mister-muffin.de/svn@200 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-16 06:06:59 +00:00
erlehmann
ee111baa67 conflict solved (i hope so)
git-svn-id: http://yolanda.mister-muffin.de/svn@199 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-15 22:00:14 +00:00
josch
226495b893 fixed entime issue, cleaned up thumbnail generation, added status display of uploads, fixed default values in upload dialogue, fixed mysql datatypes
git-svn-id: http://yolanda.mister-muffin.de/svn@198 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-14 06:18:58 +00:00
josch
3be9501d41 started upload backend, several little fixes
git-svn-id: http://yolanda.mister-muffin.de/svn@197 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-11 15:05:33 +00:00
erlehmann
22417a9342 upload dialog complete: i expect crack and whores to be delivered to my
space station


git-svn-id: http://yolanda.mister-muffin.de/svn@196 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-07 20:54:21 +00:00
erlehmann
725ef2dfd9 video with media player plugin works again
(correct MIME type is application/ogg)


git-svn-id: http://yolanda.mister-muffin.de/svn@195 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-05 15:55:59 +00:00
erlehmann
3fa362e49e lalala
git-svn-id: http://yolanda.mister-muffin.de/svn@194 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-04 09:37:39 +00:00
josch
e1137a95de cleaned url generation (slashes at the end, proper encoding), added apache.conf
git-svn-id: http://yolanda.mister-muffin.de/svn@192 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-01 18:04:28 +00:00
erlehmann
08766cbc93 embedded mode fuck yeah
git-svn-id: http://yolanda.mister-muffin.de/svn@191 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-12-01 04:43:13 +00:00
erlehmann
91ee099c00 analysis is boring
git-svn-id: http://yolanda.mister-muffin.de/svn@190 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-30 08:35:25 +00:00
erlehmann
9150a3cfc8 minor fixes
git-svn-id: http://yolanda.mister-muffin.de/svn@189 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-29 02:27:12 +00:00
erlehmann
f0ad4c88a2 minor fixes
git-svn-id: http://yolanda.mister-muffin.de/svn@188 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-27 07:37:00 +00:00
josch
99f60517b9 added video heading, bookmark and edit button, more video data, permalink, iframe copypasta, splitted register, account, added wiki and bug links, added bookmark icons and maybe other things
git-svn-id: http://yolanda.mister-muffin.de/svn@187 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-26 14:25:31 +00:00
erlehmann
9302dd6cbe nice graphics in search results.
also, cocks.


git-svn-id: http://yolanda.mister-muffin.de/svn@186 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-25 08:14:30 +00:00
erlehmann
eb8305abac SPAWN MOAR OVERLORDS
git-svn-id: http://yolanda.mister-muffin.de/svn@185 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-25 04:44:14 +00:00
erlehmann
f8fac173a5 a party with 4000 ppl. srsly.
git-svn-id: http://yolanda.mister-muffin.de/svn@183 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-22 10:15:32 +00:00
erlehmann
22777d9764 Tristan is a mem yet.
git-svn-id: http://yolanda.mister-muffin.de/svn@182 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-22 05:21:17 +00:00
erlehmann
4bf2e31b59 minor xsl + css stuff
git-svn-id: http://yolanda.mister-muffin.de/svn@179 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-19 17:57:18 +00:00
erlehmann
ed4a3d910d css cleanup
git-svn-id: http://yolanda.mister-muffin.de/svn@178 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-18 20:26:05 +00:00
josch
23f30e8259 added embedded mode - css has to be fixed accordingly
git-svn-id: http://yolanda.mister-muffin.de/svn@177 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-07 06:55:02 +00:00
josch
384fcb6467 added tag search, a few improvements on the results page
git-svn-id: http://yolanda.mister-muffin.de/svn@176 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-05 16:24:17 +00:00
josch
283a2c5b32 improved tag search
git-svn-id: http://yolanda.mister-muffin.de/svn@175 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-02 20:00:58 +00:00
josch
007c212250 fixed locale test
git-svn-id: http://yolanda.mister-muffin.de/svn@174 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-02 13:04:27 +00:00
josch
b8b82f5fe8 fallback locale
git-svn-id: http://yolanda.mister-muffin.de/svn@173 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-02 12:39:25 +00:00
josch
ba705058f1 inteface fixes + tagcloud
git-svn-id: http://yolanda.mister-muffin.de/svn@172 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-02 12:12:44 +00:00
josch
de6e466797 upload now works again - fixed daemon.pl
git-svn-id: http://yolanda.mister-muffin.de/svn@171 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-11-01 23:00:14 +00:00
josch
f4928261dd added borders around elements - still looks ugly - erlehman please fix issue
git-svn-id: http://yolanda.mister-muffin.de/svn@169 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-30 16:28:29 +00:00
josch
e2ef952f70 created the basic upload form
git-svn-id: http://yolanda.mister-muffin.de/svn@168 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-30 10:44:55 +00:00
josch
5256c1f34e naturally i forgot the small logo...
git-svn-id: http://yolanda.mister-muffin.de/svn@166 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-29 21:40:19 +00:00
josch
ea19f658b9 now everything should be updated to the new project name
git-svn-id: http://yolanda.mister-muffin.de/svn@165 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-29 21:26:39 +00:00
josch
f128cced86 minor path fix
git-svn-id: http://yolanda.mister-muffin.de/svn@157 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-29 17:23:32 +00:00
josch
71b996fece centralized searching as I did with the xml creation in my last commit - now all searches in accoun.pl, search.pl and video.pl use the same code. also improved the account interface
git-svn-id: http://yolanda.mister-muffin.de/svn@156 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-29 16:47:16 +00:00
josch
9a1de07513 improved speed by significantly reducing mysql queries on each request and optimized xml generation
git-svn-id: http://yolanda.mister-muffin.de/svn@155 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-29 15:00:40 +00:00
josch
4820060d1d fixed minor bugs
git-svn-id: http://yolanda.mister-muffin.de/svn@153 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-29 08:54:16 +00:00
josch
8575d7509f fixed login dialogue
git-svn-id: http://yolanda.mister-muffin.de/svn@150 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-28 20:58:25 +00:00
josch
e8a1ac1b2b splitted xslt
git-svn-id: http://yolanda.mister-muffin.de/svn@148 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-28 03:06:45 +00:00
josch
30c136a1d8 added account.pl with video list capabilities, inserted edit button for own videos in result list
git-svn-id: http://yolanda.mister-muffin.de/svn@145 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-27 11:59:23 +00:00
josch
060b27682f fixed utf-8 encoding prob
git-svn-id: http://yolanda.mister-muffin.de/svn@141 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-26 17:42:03 +00:00
josch
43c07155f8 user can choose between cortado and video plugin
git-svn-id: http://yolanda.mister-muffin.de/svn@140 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-26 16:25:47 +00:00
josch
bacb8c775d completed paginated, sorted display of search results
git-svn-id: http://yolanda.mister-muffin.de/svn@139 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-26 12:51:00 +00:00
josch
a826f9b93e added pagination, fixed encoding bug
git-svn-id: http://yolanda.mister-muffin.de/svn@137 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-26 00:35:29 +00:00
josch
ef8cdb725b set cortado attributes, fixed url in search.pl
git-svn-id: http://yolanda.mister-muffin.de/svn@136 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-24 13:17:31 +00:00
josch
cd2518d9e3 added correct paths
git-svn-id: http://yolanda.mister-muffin.de/svn@135 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-24 12:56:56 +00:00
erlehmann
066eb3d961 view needs a different url than download
git-svn-id: http://yolanda.mister-muffin.de/svn@133 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-24 10:57:19 +00:00
erlehmann
deb06fbb74 only minor fail, fixed
git-svn-id: http://yolanda.mister-muffin.de/svn@130 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-24 04:31:05 +00:00
erlehmann
0a36e43d9c fixed comment layout and stuff
(see video-test.xml for further information)

i still don't like nested divs but i use them because i could not 
imagine anything else in the middle of the night



git-svn-id: http://yolanda.mister-muffin.de/svn@129 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-24 04:29:42 +00:00
josch
eabba95088 added rating, fixed params, added comments info
git-svn-id: http://yolanda.mister-muffin.de/svn@128 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-23 23:12:41 +00:00
josch
2e87689371 implemented referer
git-svn-id: http://yolanda.mister-muffin.de/svn@127 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-23 21:29:16 +00:00
erlehmann
1a41016a10 new upload interface,
upload is broken currently


git-svn-id: http://yolanda.mister-muffin.de/svn@126 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-23 16:12:32 +00:00
josch
f4de6ea494 comments completely usable
git-svn-id: http://yolanda.mister-muffin.de/svn@125 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-22 20:50:45 +00:00
josch
454deb0c91 added comment posting functionality
git-svn-id: http://yolanda.mister-muffin.de/svn@123 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-22 19:15:39 +00:00
erlehmann
f12588fbc8 messageboxes fully implemented
there are 3 types: error, information and warning



git-svn-id: http://yolanda.mister-muffin.de/svn@115 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-21 22:02:39 +00:00
erlehmann
1de3dba3e3 messagebox prototype
git-svn-id: http://yolanda.mister-muffin.de/svn@114 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-21 20:59:32 +00:00
erlehmann
b1d68209f7 simple extended upload form
seems i didn't break the uploader this time

also, all dublin core entities changed to upper case
(e.g. "DC.Title" instead of "DC.title")



git-svn-id: http://yolanda.mister-muffin.de/svn@108 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-21 04:01:44 +00:00
josch
40a1fc3405 added openid login
git-svn-id: http://yolanda.mister-muffin.de/svn@104 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-20 16:32:04 +00:00
erlehmann
04c5926e86 finally, a somehow sane design to present video metadata on the player
page.
sane design for search results follows.



git-svn-id: http://yolanda.mister-muffin.de/svn@102 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-20 08:43:36 +00:00
erlehmann
0088db58fd forgot cc no-derivs icon
hell, why should one use /that/ ?



git-svn-id: http://yolanda.mister-muffin.de/svn@95 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-19 20:21:29 +00:00
erlehmann
82a98c225a download link on video site
git-svn-id: http://yolanda.mister-muffin.de/svn@94 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-19 20:05:27 +00:00
erlehmann
c145448617 creative commons, yeah !
git-svn-id: http://yolanda.mister-muffin.de/svn@92 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-19 16:56:45 +00:00
erlehmann
b980cb3ae4 during the upgrade to feisty fawn, apache won't start
so i decided to submit part of xml creative commons support now
 


git-svn-id: http://yolanda.mister-muffin.de/svn@89 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-19 01:11:04 +00:00
erlehmann
ca26452e2a in der uni gemacht, in einer langweiligen vorlesung
git-svn-id: http://yolanda.mister-muffin.de/svn@87 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-18 11:43:41 +00:00
josch
50dd246404 changed caption to description
git-svn-id: http://yolanda.mister-muffin.de/svn@86 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-18 09:53:32 +00:00
erlehmann
eff95e520d creative commons xml stuff works kinda crappy
at least i have figured it out now
could sleep this night (damn you, party)
so rest follows tomorrow or in the next few days



git-svn-id: http://yolanda.mister-muffin.de/svn@83 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-18 04:50:49 +00:00
erlehmann
4adc942a43 here be dragons
git-svn-id: http://yolanda.mister-muffin.de/svn@81 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-17 18:59:15 +00:00
erlehmann
98031e0f34 lalala
git-svn-id: http://yolanda.mister-muffin.de/svn@80 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-17 18:54:53 +00:00
josch
15ad6bca36 added convert daemon
git-svn-id: http://yolanda.mister-muffin.de/svn@77 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-17 12:55:35 +00:00
erlehmann
4a99924443 xspf, yeah
xml rules the intarweb



git-svn-id: http://yolanda.mister-muffin.de/svn@67 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-13 00:19:34 +00:00
erlehmann
15b5fefb51 i am going to make xspf playlists, yeah
git-svn-id: http://yolanda.mister-muffin.de/svn@66 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-12 21:35:03 +00:00
erlehmann
3e22f0fa08 lalala
git-svn-id: http://yolanda.mister-muffin.de/svn@65 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-12 16:46:37 +00:00
josch
76621b19c5 fixed login form
git-svn-id: http://yolanda.mister-muffin.de/svn@60 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-12 15:32:42 +00:00
erlehmann
ba465eef17 login badly fscked up, but it looks nice
git-svn-id: http://yolanda.mister-muffin.de/svn@59 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-12 15:12:44 +00:00
erlehmann
670989df53 lalalala
git-svn-id: http://yolanda.mister-muffin.de/svn@58 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-12 13:09:07 +00:00
erlehmann
24994ab419 lol internet
git-svn-id: http://yolanda.mister-muffin.de/svn@57 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-12 12:42:01 +00:00
erlehmann
f3fb99d68a conflict solved ?
git-svn-id: http://yolanda.mister-muffin.de/svn@56 7eef14d0-6ed0-489d-bf55-20463b2d70db
2007-10-12 12:19:59 +00:00