chiark / gitweb /
Merge from 3.0 fixes branch
authorRichard Kettlewell <rjk@greenend.org.uk>
Sun, 20 Apr 2008 19:17:45 +0000 (20:17 +0100)
committerRichard Kettlewell <rjk@greenend.org.uk>
Sun, 20 Apr 2008 19:17:45 +0000 (20:17 +0100)
1  2 
CHANGES
lib/trackdb.c
lib/trackdb.h

diff --cc CHANGES
Simple merge
diff --cc lib/trackdb.c
Simple merge
diff --cc lib/trackdb.h
@@@ -171,12 -171,8 +171,13 @@@ int trackdb_edituserinfo(const char *us
  char **trackdb_listusers(void);
  int trackdb_confirm(const char *user, const char *confirmation,
                      rights_type *rightsp);
+ int trackdb_readable(void);
  
 +typedef void random_callback(struct ev_source *ev,
 +                             const char *track);
 +int trackdb_request_random(struct ev_source *ev,
 +                           random_callback *callback);
 +
  #endif /* TRACKDB_H */
  
  /*