diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-12-09 16:03:02 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-12-09 16:03:02 +0100 |
| commit | 1a1e0efa7b1894848c81d7f7e80bdcf6e8591c3f (patch) | |
| tree | e8f48d76c145635acf5acf19dd5274038f3d21de /Makefile | |
| parent | 99e021d4d6b29bb180a7c6a8883251408b7a3f62 (diff) | |
| parent | 8ec4ea37162121bf76d9df4b469478697ef6ba04 (diff) | |
| download | Melon-1a1e0efa7b1894848c81d7f7e80bdcf6e8591c3f.tar.gz Melon-1a1e0efa7b1894848c81d7f7e80bdcf6e8591c3f.zip | |
Merge branch 'master' into mountpoints
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ -.PHONY: clean, mrproper, Init.rfs, commit +.PHONY: clean, mrproper, Init.rfs, floppy, commit Projects = Kernel Library Tools/MakeRamFS Applications/Shell Applications/PaperWork Applications/Demos |